diff --git a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java index 2a334af8..86fc6f65 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -128,9 +128,9 @@ public class ProvinceController { @RequestMapping(value = "/query/coach", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse queryCoach(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查找此单位的领队和教练信息:{}",params); - ProvinceCompeteVo.CompeteCompanyHeadList competeCompanyCoachList = provinceService.queryCoach(params.getParam()); - log.info("查找此单位的领队和教练信息:{}",competeCompanyCoachList); - return JsonResponse.newInstance().ok(competeCompanyCoachList); + ProvinceCompeteVo.CompeteCompanyHeadList competeCompanyHeadList = provinceService.queryCoach(params.getParam()); + log.info("查找此单位的领队和教练信息:{}",competeCompanyHeadList); + return JsonResponse.newInstance().ok(competeCompanyHeadList); } // // @MustLogin diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java index 85bf1c14..a2e88edd 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java @@ -138,7 +138,7 @@ public class ProvinceCompeteVo { public static class CompeteCompanyHeadList { @ApiModelProperty("教练集合") private List competeCompanyCoachList; - @ApiModelProperty("领队信息") + @ApiModelProperty("领队集合") private List competeCompanyLeadersList; } diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java index 93f6bdc2..59e4c904 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -295,18 +295,16 @@ public class ProvinceService implements IProvinceService { competeCoachExample.createCriteria().andCompanyIdEqualTo(company); List competeCoachList = competeCoachMapper.selectByExample(competeCoachExample); -// ProvinceCompeteVo.CompeteCompanyCoach competeCompanyCoach = new ProvinceCompeteVo.CompeteCompanyCoach(); List competeCompanyCoachList = new ArrayList(); -// ProvinceCompeteVo.CompeteCompanyLeader competeCompanyLeader = new ProvinceCompeteVo.CompeteCompanyLeader(); List competeCompanyLeadersList = new ArrayList(); ProvinceCompeteVo.CompeteCompanyHeadList competeCompanyHeadList = new ProvinceCompeteVo.CompeteCompanyHeadList(); if (CollectionUtil.isNotEmpty(competeCoachList)){ for (CompeteCoach competeCoach : competeCoachList){ if (competeCoach.getIdentity() == 0){ - ProvinceCompeteVo.CompeteCompanyCoach competeCompanyCoach = new ProvinceCompeteVo.CompeteCompanyCoach(); //给领队赋值 + ProvinceCompeteVo.CompeteCompanyCoach competeCompanyCoach = new ProvinceCompeteVo.CompeteCompanyCoach(); competeCompanyCoach.setCoachName(competeCoach.getName()); competeCompanyCoach.setCoachId(competeCoach.getId()); competeCompanyCoach.setGender(competeCoach.getGender()); @@ -315,8 +313,8 @@ public class ProvinceService implements IProvinceService { }else { - ProvinceCompeteVo.CompeteCompanyLeader competeCompanyLeader = new ProvinceCompeteVo.CompeteCompanyLeader(); //给教练赋值 + ProvinceCompeteVo.CompeteCompanyLeader competeCompanyLeader = new ProvinceCompeteVo.CompeteCompanyLeader(); competeCompanyLeader.setGuideName(competeCoach.getName()); competeCompanyLeader.setGuideId(competeCoach.getId()); competeCompanyLeader.setGender(competeCoach.getGender()); @@ -327,6 +325,9 @@ public class ProvinceService implements IProvinceService { competeCompanyHeadList.setCompeteCompanyLeadersList(competeCompanyLeadersList); competeCompanyHeadList.setCompeteCompanyCoachList(competeCompanyCoachList); + }else { + competeCompanyHeadList.setCompeteCompanyLeadersList(competeCompanyLeadersList); + competeCompanyHeadList.setCompeteCompanyCoachList(competeCompanyCoachList); } return competeCompanyHeadList; } @@ -438,18 +439,25 @@ public class ProvinceService implements IProvinceService { @Override public void updateLeader(ProvinceCompeteDto.ModifyLeader param) { - Long coachId=param.getCoachId(); - if(ObjectUtil.isNull(coachId)){ - CompeteCoach competeCoach=new CompeteCoach(); - competeCoach.setId(snowflake.nextId()); - BeanUtil.copyProperties(param,competeCoach); - competeCoachMapper.insertSelective(competeCoach); - }else{ - CompeteCoach competeCoach=competeCoachMapper.selectByPrimaryKey(coachId); - if(ObjectUtil.isNotNull(competeCoach)){ - BeanUtil.copyProperties(param,competeCoach); - competeCoachMapper.updateByPrimaryKeySelective(competeCoach); + if(ObjectUtil.isNull(param.getCoachId())){ + CompeteCoachExample competeCoachExample = new CompeteCoachExample(); + competeCoachExample.createCriteria().andCompanyIdEqualTo(param.getCompanyId()).andIdentityEqualTo((byte) param.getIdentity()); + long count = competeCoachMapper.countByExample(competeCoachExample); + if (param.getIdentity() == 0 && count >= 2){ + throw new BaseException(CodeEnum.COACH_NUM_FULL); } + if (param.getIdentity() == 1 && count >=3){ + throw new BaseException(CodeEnum.COACH_NUM_FULL); + } + CompeteCoach competeCoach1 = new CompeteCoach(); + competeCoach1.setId(snowflake.nextId()); + BeanUtil.copyProperties(param, competeCoach1); + competeCoachMapper.insertSelective(competeCoach1); + }else { + CompeteCoach competeCoach2 = new CompeteCoach(); + competeCoach2.setId(snowflake.nextId()); + BeanUtil.copyProperties(param, competeCoach2); + competeCoachMapper.insertSelective(competeCoach2); } } diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 5889ff7f..5c2cd5c4 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: test - include: common, util-test \ No newline at end of file + active: dev + include: common, util-dev \ No newline at end of file diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java index 880a3c59..98ab9657 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/util/src/main/java/com/ccsens/util/CodeEnum.java @@ -162,7 +162,9 @@ public enum CodeEnum { DINGDING_EXCEPTION(132,"钉钉接口调用异常。",true), URL_ERROR(133, "请求路径转换异常", true), JOIN_PROJECT_NUM_FULL(134, "可参赛次数已满", true), - PHOTO_FILE_EXCEED_2M(134, "图片大小不能超过2M", true), + PHOTO_FILE_EXCEED_2M(135, "图片大小不能超过2M", true), + COACH_NUM_FULL(136,"该单位领队或教练人数已达上限",true) + ;