20201111v1.3

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<ProvinceCompeteDto.DelTeam> params) {
+        log.info("删除报名的队伍：{}",params);
+        provinceService.delJoinTeam(params.getParam());
+        log.info("删除报名的队伍");
+        return JsonResponse.newInstance().ok();
+    }
 }

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;
+    }
 }

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<PlayerInfoByGroup> playerList;
     }

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

@@ -145,4 +145,10 @@ public interface IProvinceService {
      * @return 返回所有可参赛的选手和已经参赛的选手
      */
     List<ProvinceCompeteVo.GroupAndPlayer> getPlayerByTeamProjectWithRule(ProvinceCompeteDto.GetPlayerByTeamProjectWithRule param);
+
+    /**
+     * 删除参赛的队伍
+     * @param param ok
+     */
+    void delJoinTeam(ProvinceCompeteDto.DelTeam param);
 }

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)){
+            if(competeProject.getJoinRule() == 0) {
                 groupAndPlayerList = competeCompanyDao.getPlayerByTeamProject(param.getCompanyId(), param.getProjectId(), competeProject.getType());
+            }else {
+                List<ProvinceCompeteVo.PlayerInfoByGroup> 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<CompeteTeam> 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<ProvinceCompeteVo.PlayerInfoByGroup> 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<ProvinceCompeteVo.PlayerInfoByGroup> 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<CompeteTeamMember> teamMemberList = teamMemberMapper.selectByExample(teamMemberExample);
+            if(CollectionUtil.isNotEmpty(teamMemberList)){
+                teamMemberList.forEach(teamMember -> {
+                    teamMember.setRecStatus((byte) 2);
+                    teamMemberMapper.updateByPrimaryKeySelective(teamMember);
+                });
+            }
+        }
+    }
 }
 

mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml

@@ -21,6 +21,7 @@
         <result column="groupName" property="groupName"/>
         <result column="gender" property="gender"/>
         <result column="groupRemark" property="groupRemark"/>
+        <result column="teamId" property="teamId"/>
         <collection property="playerList" ofType="com.ccsens.mt.bean.vo.ProvinceCompeteVo$PlayerInfoByGroup">
             <id column="playerId" property="playerId"/>
             <result column="playerName" property="playerName"/>
@@ -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