20201029v1.6

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

@@ -98,7 +98,7 @@ public class ProvinceCompeteDto {
     @ApiModel("选手是否参加项目")
     public static class JoinProjectPlayer{
         @NotNull
-        @ApiModelProperty("大赛id")
+        @ApiModelProperty("选手id")
         private Long playerId ;
         @ApiModelProperty("是否参加此项目 0否 1是")
         private int joinProject;

mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java

@@ -164,12 +164,12 @@ public class ProvinceCompeteVo {
         @ApiModelProperty("身份证反面照片（浏览路径）")
         private String idCardBack;
         @ApiModelProperty("一寸证件照（浏览路径）")
-        private Long idPhone;
+        private String idPhone;
         @ApiModelProperty("学籍证明（浏览路径）")
-        private Long studentRecord;
+        private String studentRecord;
         @ApiModelProperty("体检证明（浏览路径）")
-        private Long healthRecord;
+        private String healthRecord;
         @ApiModelProperty("保险证明（浏览路径）")
-        private Long insuranceRecord;
+        private String insuranceRecord;
     }
 }

mt/src/main/java/com/ccsens/mt/persist/dao/CompetePlayerDao.java

@@ -53,4 +53,11 @@ public interface CompetePlayerDao extends CompetePlayerMapper {
      * @return 返回成员列表
      */
     List<ProvinceCompeteVo.PlayerByCompanyId> queryPlayerByCompanyId(@Param("companyId")Long companyId);
+
+    /**
+     * 查找选手详细信息
+     * @param playerId 选手id
+     * @return 返回详细信息
+     */
+    ProvinceCompeteVo.PlayerInfo getPlayerByPlayerId(@Param("playerId")Long playerId);
 }

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

@@ -290,7 +290,7 @@ public class ProvinceService implements IProvinceService {
         CompeteCoachExample competeCoachExample = new CompeteCoachExample();
         competeCoachExample.createCriteria().andCompanyIdEqualTo(company);
         List<CompeteCoach> competeCoachList = competeCoachMapper.selectByExample(competeCoachExample);
-        ProvinceCompeteVo.CompeteCompanyCoach CompeteCompanyCoach = new ProvinceCompeteVo.CompeteCompanyCoach();
+        ProvinceCompeteVo.CompeteCompanyCoach competeCompanyCoach = new ProvinceCompeteVo.CompeteCompanyCoach();
         List<ProvinceCompeteVo.CompeteCompanyCoach> competeCompanyCoachList = new ArrayList();
         ProvinceCompeteVo.CompeteCompanyLeader competeCompanyLeader = new ProvinceCompeteVo.CompeteCompanyLeader();
         List<ProvinceCompeteVo.CompeteCompanyLeader> competeCompanyLeadersList = new ArrayList();
@@ -299,11 +299,11 @@ public class ProvinceService implements IProvinceService {
             for (CompeteCoach competeCoach : competeCoachList){
                 if (competeCoach.getIdentity() == 0){
             //给领队赋值
-                    CompeteCompanyCoach.setCoachName(competeCoach.getName());
-                    CompeteCompanyCoach.setCoachId(competeCoach.getId());
-                    CompeteCompanyCoach.setGender(competeCoach.getGender());
-                    CompeteCompanyCoach.setPhone(competeCoach.getPhone());
-                    competeCompanyCoachList.add(CompeteCompanyCoach);
+                    competeCompanyCoach.setCoachName(competeCoach.getName());
+                    competeCompanyCoach.setCoachId(competeCoach.getId());
+                    competeCompanyCoach.setGender(competeCoach.getGender());
+                    competeCompanyCoach.setPhone(competeCoach.getPhone());
+                    competeCompanyCoachList.add(competeCompanyCoach);
 
 
                 }else {
@@ -373,9 +373,30 @@ public class ProvinceService implements IProvinceService {
         CompetePlayer competePlayer = competePlayerMapper.selectByPrimaryKey(playerId);
         if (ObjectUtil.isNotNull(competePlayer)){
             competePlayer.setRecStatus((byte) 2);
-            CompetePlayerExample competePlayerExample = new CompetePlayerExample();
-            competePlayerExample.createCriteria().andIdEqualTo(playerId);
-            competePlayerMapper.updateByExampleSelective(competePlayer,competePlayerExample);
+            competePlayerMapper.updateByPrimaryKeySelective(competePlayer);
+            //删除成员报名的信息
+            CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample();
+            projectPlayerExample.createCriteria().andPlayerIdEqualTo(playerId);
+            List<CompeteProjectPlayer> projectPlayerList = projectPlayerMapper.selectByExample(projectPlayerExample);
+            if(CollectionUtil.isNotEmpty(projectPlayerList)){
+                projectPlayerList.forEach(projectPlayer -> {
+                    projectPlayer.setRecStatus((byte) 2);
+                    projectPlayerMapper.updateByPrimaryKeySelective(projectPlayer);
+                });
+            }
+            //团队
+            CompeteTeamMemberExample memberExample = new CompeteTeamMemberExample();
+            memberExample.createCriteria().andPlayerIdEqualTo(playerId);
+            List<CompeteTeamMember> memberList = teamMemberMapper.selectByExample(memberExample);
+            if(CollectionUtil.isNotEmpty(memberList)){
+                memberList.forEach(member -> {
+                    member.setRecStatus((byte) 2);
+                    teamMemberMapper.updateByPrimaryKeySelective(member);
+                });
+            }
+//            CompetePlayerExample competePlayerExample = new CompetePlayerExample();
+//            competePlayerExample.createCriteria().andIdEqualTo(playerId);
+//            competePlayerMapper.updateByExampleSelective(competePlayer,competePlayerExample);
         }else {
             throw  new BaseException(CodeEnum.PARAM_ERROR);
         }
@@ -383,25 +404,27 @@ public class ProvinceService implements IProvinceService {
 
     @Override
     public ProvinceCompeteVo.PlayerInfo getPlayerInfo(CompeteDto.DelPlayer param) {
-        Long playerId = param.getPlayerId();
-        CompetePlayer competePlayer = competePlayerMapper.selectByPrimaryKey(playerId);
-        if (ObjectUtil.isNull(competePlayer)){
-            throw new BaseException(CodeEnum.PARAM_ERROR);
-        }
-        ProvinceCompeteVo.PlayerInfo playerInfo = new ProvinceCompeteVo.PlayerInfo();
-        playerInfo.setPlayerId(competePlayer.getId());
-        playerInfo.setCompeteId(competePlayer.getCompeteTimeId());
-        playerInfo.setGroupId(competePlayer.getCompeteGroupId());
-        playerInfo.setPlayerName(competePlayer.getName());
-        playerInfo.setGender(competePlayer.getGender());
-        playerInfo.setIdCard(competePlayer.getIdCard());
-        playerInfo.setIdCardFront(competePlayer.getIdCardFront());
-        playerInfo.setIdCardBack(competePlayer.getIdCardBack());
-        playerInfo.setIdPhone(competePlayer.getIdPhotoFile());
-        playerInfo.setStudentRecord(competePlayer.getStudentRecordFile());
-        playerInfo.setHealthRecord(competePlayer.getHealthRecordFile());
-        playerInfo.setInsuranceRecord(competePlayer.getInsuranceRecordFile());
-        return playerInfo;
+//
+//        Long playerId = param.getPlayerId();
+//        CompetePlayer competePlayer = competePlayerMapper.selectByPrimaryKey(playerId);
+//        if (ObjectUtil.isNull(competePlayer)){
+//            throw new BaseException(CodeEnum.PARAM_ERROR);
+//        }
+//        ProvinceCompeteVo.PlayerInfo playerInfo = new ProvinceCompeteVo.PlayerInfo();
+//        playerInfo.setPlayerId(competePlayer.getId());
+//        playerInfo.setCompeteId(competePlayer.getCompeteTimeId());
+//        playerInfo.setGroupId(competePlayer.getCompeteGroupId());
+//        playerInfo.setPlayerName(competePlayer.getName());
+//        playerInfo.setGender(competePlayer.getGender());
+//        playerInfo.setIdCard(competePlayer.getIdCard());
+//        playerInfo.setIdCardFront(competePlayer.getIdCardFront());
+//        playerInfo.setIdCardBack(competePlayer.getIdCardBack());
+//        playerInfo.setIdPhone(competePlayer.getIdPhotoFile());
+//        playerInfo.setStudentRecord(competePlayer.getStudentRecordFile());
+//        playerInfo.setHealthRecord(competePlayer.getHealthRecordFile());
+//        playerInfo.setInsuranceRecord(competePlayer.getInsuranceRecordFile());
+//        return playerInfo;
+        return competePlayerDao.getPlayerByPlayerId(param.getPlayerId());
     }
 
     @Override
@@ -438,7 +461,7 @@ public class ProvinceService implements IProvinceService {
                 joinCount++;
             }
         }
-        if(joinCount < competeProject.getMemberMin() || joinCount > competeProject.getMemberMax()){
+        if(joinCount > competeProject.getMemberMax() ){
             throw new BaseException(CodeEnum.TEAM_MEMBER_ERROR);
         }
         //判断项目是个人还是团队，参加

mt/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: dev
-    include: common, util-dev
+    active: test
+    include: common, util-test

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

@@ -51,7 +51,7 @@
         FROM
 		t_compete_group cg
         LEFT JOIN t_compete_player p on cg.id = p.compete_group_id
-        LEFT JOIN t_compete_project_player pp on p.id = pp.player_id and pp.project_id = 1
+        LEFT JOIN t_compete_project_player pp on p.id = pp.player_id and pp.project_id = #{projectId} and pp.rec_status = 0
         LEFT JOIN
         ( SELECT
             m.id as mId,
@@ -72,7 +72,6 @@
         </if>
         AND (p.compete_group_id =#{groupId} or p.compete_group_id is null)
         AND (p.rec_status = 0 or p.rec_status is null)
-        AND (pp.rec_status = 0 or pp.rec_status is null)
      </select>
     <select id="queryProjectByCompeteTimeId"  resultMap="compete_project">
         SELECT

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

@@ -163,4 +163,24 @@
         WHERE p.company_id = #{companyId}
         and p.rec_status = 0
     </select>
+    <select id="getPlayerByPlayerId" resultType="com.ccsens.mt.bean.vo.ProvinceCompeteVo$PlayerInfo">
+        SELECT
+        id as playerId,
+        `name` as playerName,
+        gender,
+        id_card as idCard,
+        company_id as competeId,
+        compete_group_id as groupId,
+        (SELECT visit_location FROM t_common_file WHERE id = id_card_front_file) as idCardFront,
+        (SELECT visit_location FROM t_common_file WHERE id = id_card_back_file) as idCardBack,
+        (SELECT visit_location FROM t_common_file WHERE id = id_photo_file) as idPhone,
+        (SELECT visit_location FROM t_common_file WHERE id = student_record_file) as studentRecord,
+        (SELECT visit_location FROM t_common_file WHERE id = health_record_file) as healthRecord,
+        (SELECT visit_location FROM t_common_file WHERE id = insurance_record_file) as insuranceRecord
+        FROM
+        t_compete_player
+        WHERE
+        id = #{playerId}
+        and rec_status = 0
+    </select>
 </mapper>