From 8182bc87ec7f27cef31f07b30d089377d06b778c Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Tue, 10 Nov 2020 18:23:53 +0800 Subject: [PATCH 1/4] 20201110mtV1.6 --- .../java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java | 2 ++ .../java/com/ccsens/mt/service/ProvinceService.java | 9 ++++++++- mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml | 10 +++++----- 3 files changed, 15 insertions(+), 6 deletions(-) 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 88911e1d..450b41a3 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 @@ -81,6 +81,8 @@ public class ProvinceCompeteVo { private String name; @ApiModelProperty("是否是团队项目 0否 1是") private byte team; + @ApiModelProperty("参赛规则 0限制组别 1不限组别") + private byte joinRule; @ApiModelProperty("最少人数") private int memberMin; @ApiModelProperty("最多人数") 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 5eaf9556..604dd8e7 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -620,6 +620,13 @@ public class ProvinceService implements IProvinceService { } } +// /** +// * 参加个人比赛 +// */ +// private void joinTiwnProject(){ +// +// } + /** * 查找教练详细信息 */ @@ -633,7 +640,7 @@ public class ProvinceService implements IProvinceService { */ @Override public List getPlayerByTeamProject(ProvinceCompeteDto.GetPlayerByTeamProject param) { - List groupAndPlayerList = null; + List groupAndPlayerList = new ArrayList<>(); //查找项目 CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); if(ObjectUtil.isNotNull(competeProject)){ diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index 1eda459c..64153f6d 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -127,6 +127,7 @@ p.id as id, p.`name` as `name`, team, + p.join_rule as joinRule, member_min as memberMin, member_max as memberMax, if( @@ -233,11 +234,10 @@ + \ 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 9d96e5ce..0806e037 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/util/src/main/java/com/ccsens/util/CodeEnum.java @@ -175,6 +175,7 @@ public enum CodeEnum { CONTACTS_NAME_EMPTY(144,"联系人名称不能为空",true), MEMBER_NUM_ERROR(145,"参赛人数不满足比赛人数要求",true), GENDER_ERROR(146,"请选择正确的性别",true), + JOIN_AUTH_GROUP(147,"已参加了其他组别，无法再次报名",true), ; @@ -183,7 +184,10 @@ public enum CodeEnum { this.msg = "请上传"+msg; return this; } - + public static String mtJoinAuthGroup(String msg){ + msg = msg+"已参加了其他组别，无法再次报名"; + return msg; + } public CodeEnum mtProjectMsg(String msg){ this.msg = msg+"项目参赛次数已满"; return this; From 756ebf8a2e66d13ccbaa95136d652a15147f39b7 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 11 Nov 2020 10:51:54 +0800 Subject: [PATCH 3/4] 20201111v1.1 --- .../ccsens/mt/bean/vo/ProvinceCompeteVo.java | 4 ++++ .../mt/persist/dao/CompeteCompanyDao.java | 4 +++- .../ccsens/mt/service/ProvinceService.java | 12 ++++++---- .../mapper_dao/CompeteCompanyDao.xml | 22 +++++++++++++++++-- 4 files changed, 35 insertions(+), 7 deletions(-) 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 450b41a3..dcd6c676 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 @@ -48,6 +48,10 @@ public class ProvinceCompeteVo { private Long groupId; @ApiModelProperty("组别名字") private String groupName; + @ApiModelProperty("性别组") + private int gender; + @ApiModelProperty("组别信息") + private int groupRemark; @ApiModelProperty("选手信息") private List playerList; } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java index 6266f255..f79d8f8e 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteCompanyDao.java @@ -102,7 +102,7 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper { * @param type * @return */ - List getPlayerByTeamProject(@Param("projectId")Long projectId, @Param("type")Byte type); + List getPlayerByTeamProject(@Param("companyId")Long companyId, @Param("projectId")Long projectId, @Param("type")Byte type); /** * 根据大赛id查看当前大赛所有队伍信息,以及联系人的信息 * @param CompeteTimeId 大赛CompeteTimeId @@ -140,4 +140,6 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper { */ int getTeamNumByPlayerIdAndGroup(@Param("competeTimeId")Long competeTimeId, @Param("playerId")Long playerId, @Param("projectId")Long projectId, @Param("companyId")Long companyId, @Param("gender")int gender, @Param("groupRemark")int groupRemark); + + List queryPlayersByTeamProject(@Param("companyId")Long companyId, @Param("projectId")Long projectId); } 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 b1ab657c..50d5e977 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -635,8 +635,8 @@ public class ProvinceService implements IProvinceService { competeTeam.setCompeteTimeId(param.getCompeteTimeId()); competeTeam.setProjectId(param.getProjectId()); competeTeam.setCompanyId(param.getCompanyId()); - competeTeam.setCompanyId((long) param.getGender()); - competeTeam.setCompanyId((long) param.getGroupRemark()); + competeTeam.setGenderGroup((byte) param.getGender()); + competeTeam.setGroupRemark((byte) param.getGroupRemark()); //添加团队表 competeTeamDao.insertSelective(competeTeam); } @@ -754,7 +754,7 @@ public class ProvinceService implements IProvinceService { //查找项目 CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); if(ObjectUtil.isNotNull(competeProject)){ - groupAndPlayerList = competeCompanyDao.getPlayerByTeamProject(param.getProjectId(),competeProject.getType()); + groupAndPlayerList = competeCompanyDao.getPlayerByTeamProject(param.getCompanyId(),param.getProjectId(),competeProject.getType()); } return groupAndPlayerList; } @@ -770,7 +770,11 @@ public class ProvinceService implements IProvinceService { if(ObjectUtil.isNotNull(competeProject) && competeProject.getTeam() == 1){ //如果同单位不限组别 if(competeProject.getJoinRule() == 1){ - groupAndPlayerList = competeCompanyDao.queryPlayerByGroupId(competeProject.getType(),param.getCompanyId(),null,param.getProjectId()); +// groupAndPlayerList = competeCompanyDao.queryPlayerByGroupId(competeProject.getType(),param.getCompanyId(),null,param.getProjectId()); + List playerInfoByGroupList = competeCompanyDao.queryPlayersByTeamProject(param.getCompanyId(),param.getProjectId()); + ProvinceCompeteVo.GroupAndPlayer groupAndPlayer = new ProvinceCompeteVo.GroupAndPlayer(); + groupAndPlayer.setGroupName("不限制组别"); + groupAndPlayer.setPlayerList(playerInfoByGroupList); } //如果同单位限制组别 if(competeProject.getJoinRule() == 0){ diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index 467c77f3..f8ae9d5b 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -19,6 +19,8 @@ + + @@ -245,8 +247,8 @@ LEFT JOIN t_compete_player p on m.player_id = p.id WHERE t.project_id = #{projectId} - and - g.type = #{type} + and t.company_id = #{companyId} + and g.type = #{type} and g.rec_status = 0 and t.rec_status = 0 and m.rec_status = 0 @@ -289,6 +291,8 @@ g.group_name as groupName, p.id as playerId, p.`name` as playerName, + a.mRemark as groupRemark, + a.mGender as gender, if(a.tId is null,0,1) as joinProject FROM t_compete_group g @@ -339,5 +343,19 @@ and t.rec_status = 0 and m.rec_status = 0 + \ No newline at end of file From 134e1e44b73e4cd42b96d85fcb08c63f985b11e9 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 11 Nov 2020 13:22:30 +0800 Subject: [PATCH 4/4] 20201111v1.3 --- .../com/ccsens/mt/api/ProvinceController.java | 10 ++++ .../mt/bean/dto/ProvinceCompeteDto.java | 8 ++++ .../ccsens/mt/bean/vo/ProvinceCompeteVo.java | 2 + .../ccsens/mt/service/IProvinceService.java | 6 +++ .../ccsens/mt/service/ProvinceService.java | 47 ++++++++++++++++--- .../mapper_dao/CompeteCompanyDao.xml | 6 ++- 6 files changed, 72 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 d5e4dbeb..1b8daeb3 100644 --- a/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java +++ b/mt/src/main/java/com/ccsens/mt/api/ProvinceController.java @@ -201,4 +201,14 @@ public class ProvinceController { log.info("团体报名查询可以参加和已经参加的选手：{}",groupAndPlayer); return JsonResponse.newInstance().ok(groupAndPlayer); } + + @MustLogin + @ApiOperation(value = "删除报名的队伍", notes = "") + @RequestMapping(value = "/del/team", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse delJoinTeam(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("删除报名的队伍：{}",params); + provinceService.delJoinTeam(params.getParam()); + log.info("删除报名的队伍"); + return JsonResponse.newInstance().ok(); + } } diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java index e6de7633..6e72f124 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java +++ b/mt/src/main/java/com/ccsens/mt/bean/dto/ProvinceCompeteDto.java @@ -159,4 +159,12 @@ public class ProvinceCompeteDto { @ApiModelProperty("组别信息") private int groupRemark; } + + @Data + @ApiModel("删除参赛队伍") + public static class DelTeam{ + @NotNull(message = "队伍id") + @ApiModelProperty("队伍id") + private Long teamId; + } } 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 dcd6c676..3fb471a7 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 @@ -52,6 +52,8 @@ public class ProvinceCompeteVo { private int gender; @ApiModelProperty("组别信息") private int groupRemark; + @ApiModelProperty("团队id") + private Long teamId; @ApiModelProperty("选手信息") private List playerList; } diff --git a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java index 965a40a3..53f30e7d 100644 --- a/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/IProvinceService.java @@ -145,4 +145,10 @@ public interface IProvinceService { * @return 返回所有可参赛的选手和已经参赛的选手 */ List getPlayerByTeamProjectWithRule(ProvinceCompeteDto.GetPlayerByTeamProjectWithRule param); + + /** + * 删除参赛的队伍 + * @param param ok + */ + void delJoinTeam(ProvinceCompeteDto.DelTeam param); } 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 50d5e977..cbf48c89 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java @@ -754,7 +754,23 @@ public class ProvinceService implements IProvinceService { //查找项目 CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); if(ObjectUtil.isNotNull(competeProject)){ - groupAndPlayerList = competeCompanyDao.getPlayerByTeamProject(param.getCompanyId(),param.getProjectId(),competeProject.getType()); + if(competeProject.getJoinRule() == 0) { + groupAndPlayerList = competeCompanyDao.getPlayerByTeamProject(param.getCompanyId(), param.getProjectId(), competeProject.getType()); + }else { + List playerInfoByGroupList = competeCompanyDao.queryPlayersByTeamProject(param.getCompanyId(),param.getProjectId()); +// groupAndPlayerList = competeCompanyDao.queryPlayersByTeamProject(param.getCompanyId(),param.getProjectId()); + ProvinceCompeteVo.GroupAndPlayer groupAndPlayer = new ProvinceCompeteVo.GroupAndPlayer(); + + CompeteTeamExample teamExample = new CompeteTeamExample(); + teamExample.createCriteria().andProjectIdEqualTo(param.getProjectId()).andCompanyIdEqualTo(param.getCompanyId()); + List teamList = competeTeamDao.selectByExample(teamExample); + if(CollectionUtil.isNotEmpty(teamList)){ + groupAndPlayer.setTeamId(teamList.get(0).getId()); + } + groupAndPlayer.setGroupName("不限制组别"); + groupAndPlayer.setPlayerList(playerInfoByGroupList); + groupAndPlayerList.add(groupAndPlayer); + } } return groupAndPlayerList; } @@ -770,11 +786,11 @@ public class ProvinceService implements IProvinceService { if(ObjectUtil.isNotNull(competeProject) && competeProject.getTeam() == 1){ //如果同单位不限组别 if(competeProject.getJoinRule() == 1){ -// groupAndPlayerList = competeCompanyDao.queryPlayerByGroupId(competeProject.getType(),param.getCompanyId(),null,param.getProjectId()); - List playerInfoByGroupList = competeCompanyDao.queryPlayersByTeamProject(param.getCompanyId(),param.getProjectId()); - ProvinceCompeteVo.GroupAndPlayer groupAndPlayer = new ProvinceCompeteVo.GroupAndPlayer(); - groupAndPlayer.setGroupName("不限制组别"); - groupAndPlayer.setPlayerList(playerInfoByGroupList); + groupAndPlayerList = competeCompanyDao.queryPlayerByGroupId(competeProject.getType(),param.getCompanyId(),null,param.getProjectId()); +// List playerInfoByGroupList = competeCompanyDao.queryPlayersByTeamProject(param.getCompanyId(),param.getProjectId()); +// ProvinceCompeteVo.GroupAndPlayer groupAndPlayer = new ProvinceCompeteVo.GroupAndPlayer(); +// groupAndPlayer.setGroupName("不限制组别"); +// groupAndPlayer.setPlayerList(playerInfoByGroupList); } //如果同单位限制组别 if(competeProject.getJoinRule() == 0){ @@ -788,5 +804,24 @@ public class ProvinceService implements IProvinceService { } return groupAndPlayerList; } + + @Override + public void delJoinTeam(ProvinceCompeteDto.DelTeam param) { + CompeteTeam competeTeam = competeTeamDao.selectByPrimaryKey(param.getTeamId()); + if(ObjectUtil.isNotNull(competeTeam)){ + competeTeam.setRecStatus((byte) 2); + competeTeamDao.updateByPrimaryKeySelective(competeTeam); + + CompeteTeamMemberExample teamMemberExample = new CompeteTeamMemberExample(); + teamMemberExample.createCriteria().andCompeteTeamIdEqualTo(param.getTeamId()); + List teamMemberList = teamMemberMapper.selectByExample(teamMemberExample); + if(CollectionUtil.isNotEmpty(teamMemberList)){ + teamMemberList.forEach(teamMember -> { + teamMember.setRecStatus((byte) 2); + teamMemberMapper.updateByPrimaryKeySelective(teamMember); + }); + } + } + } } diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index f8ae9d5b..57baa676 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -21,6 +21,7 @@ + @@ -239,7 +240,10 @@ g.id as groupId, g.group_name as groupName, p.id as playerId, - p.`name` as playerName + p.`name` as playerName, + t.gender_group as gender, + t.group_remark as groupRemark, + t.id as teamId FROM t_compete_group g LEFT JOIN t_compete_team t on g.sex = t.gender_group and g.group_remark = t.group_remark