20201029v1.7

mt/src/main/java/com/ccsens/mt/api/ProvinceController.java

@@ -109,7 +109,7 @@ public class ProvinceController {
     @RequestMapping(value = "/save/company", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<ProvinceCompeteVo.CompeteCompany> saveCompany(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteCompany> params) {
         log.info("添加/修改单位信息：{}",params);
-        ProvinceCompeteVo.CompeteCompany competeCompany = provinceService.changeCompany(params.getParam());
+        ProvinceCompeteVo.CompeteCompany competeCompany = provinceService.changeCompany(params.getParam(),params.getUserId());
         log.info("添加/修改单位信息：{}",competeCompany);
         return JsonResponse.newInstance().ok(competeCompany);
     }

mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java

@@ -230,6 +230,8 @@ public class CompeteDto {
     @Data
     @ApiModel("当前用户参赛单位基本信息")
     public static class CompeteCompany{
+        @ApiModelProperty("大赛id")
+        private Long competeTimeId;
         @ApiModelProperty("参赛单位id")
         private Long companyId;
         @ApiModelProperty("单位名称")

mt/src/main/java/com/ccsens/mt/service/IProvinceService.java

@@ -72,7 +72,7 @@ public interface IProvinceService {
      * @param
      * @return
      */
-    ProvinceCompeteVo.CompeteCompany changeCompany(CompeteDto.CompeteCompany param);
+    ProvinceCompeteVo.CompeteCompany changeCompany(CompeteDto.CompeteCompany param, Long userId);
 
     /**
      * 添加/修改领队或教练

mt/src/main/java/com/ccsens/mt/service/ProvinceService.java

@@ -225,16 +225,14 @@ public class ProvinceService implements IProvinceService {
         if (ObjectUtil.isNull(competeCompany)){
             competeCompany = new ProvinceCompeteVo.CompeteCompany();
         }
-
         return  competeCompany;
     }
 
     @Override
-    public ProvinceCompeteVo.CompeteCompany changeCompany(CompeteDto.CompeteCompany param) {
+    public ProvinceCompeteVo.CompeteCompany changeCompany(CompeteDto.CompeteCompany param, Long userId) {
         //判断当前单位id是否为空，
         Long companyid = param.getCompanyId();
         CompeteCompany competeCompany = new CompeteCompany();
-        ProvinceCompeteVo.CompeteCompany competeCompany1 = new ProvinceCompeteVo.CompeteCompany();
         //单位id为空，新增
         if (ObjectUtil.isNull(companyid)){
             Long id = snowflake.nextId();
@@ -245,14 +243,16 @@ public class ProvinceService implements IProvinceService {
             competeCompany.setContactsPhone(param.getContactsPhone());
             competeCompany.setLeaderNum(param.getGuideNum());
             competeCompany.setJoinNum(param.getPlayerNum());
+            competeCompany.setUserId(userId);
+            competeCompany.setCompeteTimeId(param.getCompeteTimeId());
             competeCompanyDao.insertSelective(competeCompany);
-            //
+//            //
-            competeCompany1.setCompanyId(competeCompany.getId());
+//            competeCompany1.setCompanyId(competeCompany.getId());
-            competeCompany1.setCoachNum(competeCompany.getCoachNum());
+//            competeCompany1.setCoachNum(competeCompany.getCoachNum());
-            competeCompany1.setContactsName(competeCompany.getContactsName());
+//            competeCompany1.setContactsName(competeCompany.getContactsName());
-            competeCompany1.setContactsPhone(competeCompany.getContactsPhone());
+//            competeCompany1.setContactsPhone(competeCompany.getContactsPhone());
-            competeCompany1.setGuideNum(competeCompany.getLeaderNum());
+//            competeCompany1.setGuideNum(competeCompany.getLeaderNum());
-            competeCompany1.setPlayerNum(competeCompany.getJoinNum());
+//            competeCompany1.setPlayerNum(competeCompany.getJoinNum());
         }else {
             //不为空，根据单位id查出来修改  判断传进来的参数是否为空 为空则跳过   不为空则修改
             competeCompany = competeCompanyDao.selectByPrimaryKey(companyid);
@@ -274,12 +274,17 @@ public class ProvinceService implements IProvinceService {
             if (ObjectUtil.isNotNull(param.getPlayerNum())) {
                 competeCompany.setJoinNum(param.getPlayerNum());
             }
-            competeCompany1.setCompanyId(competeCompany.getId());
+            competeCompanyDao.updateByPrimaryKeySelective(competeCompany);
-            competeCompany1.setCoachNum(competeCompany.getCoachNum());
+//            competeCompany1.setCompanyId(competeCompany.getId());
-            competeCompany1.setContactsName(competeCompany.getContactsName());
+//            competeCompany1.setCoachNum(competeCompany.getCoachNum());
-            competeCompany1.setContactsPhone(competeCompany.getContactsPhone());
+//            competeCompany1.setContactsName(competeCompany.getContactsName());
-            competeCompany1.setGuideNum(competeCompany.getLeaderNum());
+//            competeCompany1.setContactsPhone(competeCompany.getContactsPhone());
-            competeCompany1.setPlayerNum(competeCompany.getJoinNum());
+//            competeCompany1.setGuideNum(competeCompany.getLeaderNum());
+//            competeCompany1.setPlayerNum(competeCompany.getJoinNum());
+        }
+        ProvinceCompeteVo.CompeteCompany competeCompany1 = competeCompanyDao.getCompany(param.getCompeteTimeId(),userId);
+        if (ObjectUtil.isNull(competeCompany1)){
+            competeCompany1 = new ProvinceCompeteVo.CompeteCompany();
         }
         return competeCompany1;
     }