From e1f52353e10c0c64758231ab472f83095d1a3be7 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Thu, 29 Oct 2020 17:28:54 +0800 Subject: [PATCH 1/4] c --- mt/src/main/java/com/ccsens/mt/service/ProvinceService.java | 1 - 1 file changed, 1 deletion(-) 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 a641b042..7b6e8201 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -217,7 +217,6 @@ public class ProvinceService implements IProvinceService { if (ObjectUtil.isNull(competeCompany)){ competeCompany = new ProvinceCompeteVo.CompeteCompany(); } - return competeCompany; } From 8ea51525d661f127d9ed4a11cb9152cdf8cbaa6f Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Thu, 29 Oct 2020 18:18:55 +0800 Subject: [PATCH 2/4] 10-29 --- .../main/java/com/ccsens/mt/api/ProvinceController.java | 8 ++++---- .../java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java | 2 +- .../main/java/com/ccsens/mt/service/ProvinceService.java | 3 +++ mt/src/main/resources/application.yml | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) 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 5a1d8ceb..321b0532 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -126,11 +126,11 @@ public class ProvinceController { @MustLogin @ApiOperation(value = "查找此单位的领队和教练信息", notes = "") @RequestMapping(value = "/query/coach", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse queryCoach(@ApiParam @Validated @RequestBody QueryDto params) { + 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 42204d34..2a842efa 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 c5fe8621..97634dcc 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -322,6 +322,9 @@ public class ProvinceService implements IProvinceService { competeCompanyHeadList.setCompeteCompanyLeadersList(competeCompanyLeadersList); competeCompanyHeadList.setCompeteCompanyCoachList(competeCompanyCoachList); + }else { + competeCompanyHeadList.setCompeteCompanyLeadersList(competeCompanyLeadersList); + competeCompanyHeadList.setCompeteCompanyCoachList(competeCompanyCoachList); } return competeCompanyHeadList; } 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 From 41aecad610ddf970fbdf7959018ea43914e85a6c Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Fri, 30 Oct 2020 10:20:43 +0800 Subject: [PATCH 3/4] 10-30 --- .../java/com/ccsens/mt/service/ProvinceService.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) 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 97634dcc..f702d402 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -294,15 +294,16 @@ public class ProvinceService implements IProvinceService { CompeteCoachExample competeCoachExample = new CompeteCoachExample(); 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(); competeCompanyCoach.setCoachName(competeCoach.getName()); competeCompanyCoach.setCoachId(competeCoach.getId()); competeCompanyCoach.setGender(competeCoach.getGender()); @@ -312,6 +313,7 @@ public class ProvinceService implements IProvinceService { }else { //给教练赋值 + ProvinceCompeteVo.CompeteCompanyLeader competeCompanyLeader = new ProvinceCompeteVo.CompeteCompanyLeader(); competeCompanyLeader.setGuideName(competeCoach.getName()); competeCompanyLeader.setGuideId(competeCoach.getId()); competeCompanyLeader.setGender(competeCoach.getGender()); @@ -436,7 +438,11 @@ public class ProvinceService implements IProvinceService { @Override public void updateLeader(ProvinceCompeteDto.ModifyLeader param) { - Long coachId=param.getCoachId(); + Long coachId = param.getCoachId(); +// Long companyId = param.getCompanyId(); +// CompeteCoachExample competeCoachExample = new CompeteCoachExample(); +// competeCoachExample.createCriteria().andCompanyIdEqualTo(companyId); +// List competeCoachList = competeCoachMapper.selectByExample(competeCoachExample); if(ObjectUtil.isNull(coachId)){ CompeteCoach competeCoach=new CompeteCoach(); competeCoach.setId(snowflake.nextId()); From 66437129579d47f19b0085d9324ce6a80ec207c9 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Fri, 30 Oct 2020 11:16:34 +0800 Subject: [PATCH 4/4] 10-30 --- .../ccsens/mt/service/ProvinceService.java | 33 ++++++++++--------- .../main/java/com/ccsens/util/CodeEnum.java | 4 ++- 2 files changed, 21 insertions(+), 16 deletions(-) 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 f702d402..3d270ea9 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -438,22 +438,25 @@ public class ProvinceService implements IProvinceService { @Override public void updateLeader(ProvinceCompeteDto.ModifyLeader param) { - Long coachId = param.getCoachId(); -// Long companyId = param.getCompanyId(); -// CompeteCoachExample competeCoachExample = new CompeteCoachExample(); -// competeCoachExample.createCriteria().andCompanyIdEqualTo(companyId); -// List competeCoachList = competeCoachMapper.selectByExample(competeCoachExample); - 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/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) + ;