20201110mt查看团队比赛参赛的选手

mt/src/main/java/com/ccsens/mt/api/ProvinceController.java

@@ -132,16 +132,6 @@ public class ProvinceController {
         log.info("查找此单位的领队和教练信息：{}",competeCompanyHeadList);
         return JsonResponse.newInstance().ok(competeCompanyHeadList);
     }
-//
-//    @MustLogin
-//    @ApiOperation(value = "保存领队和教练信息", notes = "")
-//    @RequestMapping(value = "/save/coach", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-//    public JsonResponse saveCoach(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.AddCoach> params) {
-//        log.info("保存领队和教练信息：{}",params);
-//        provinceService.saveCoach(params.getParam());
-//        log.info("保存领队和教练信息：{}","插入成功");
-//        return JsonResponse.newInstance().ok();
-//    }
 
     @MustLogin
     @ApiOperation(value = "删除领队和教练信息", notes = "")
@@ -191,4 +181,14 @@ public class ProvinceController {
         log.info("查询教练或领队的详细信息：{}",coachInfo);
         return JsonResponse.newInstance().ok(coachInfo);
     }
+
+    @MustLogin
+    @ApiOperation(value = "查找团体比赛已报名的选手信息", notes = "")
+    @RequestMapping(value = "/coachInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<ProvinceCompeteVo.GroupAndPlayer>>  getPlayerByTeamProject(@ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.GetPlayerByTeamProject> params) {
+        log.info("查询教练或领队的详细信息：{}",params);
+        List<ProvinceCompeteVo.GroupAndPlayer> groupAndPlayer = provinceService.getPlayerByTeamProject(params.getParam());
+        log.info("查询教练或领队的详细信息：{}",groupAndPlayer);
+        return JsonResponse.newInstance().ok(groupAndPlayer);
+    }
 }

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

@@ -290,7 +290,7 @@ public class CompeteDto {
 
     }
     @Data
-    @ApiModel("项目id和组别id")
+    @ApiModel("要删除的选手id")
     public static class DelPlayer{
         @NotNull
         @ApiModelProperty("选手id")

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

@@ -51,6 +51,8 @@ public class ProvinceCompeteDto {
         private Long competeId;
         @ApiModelProperty("组别id")
         private Long groupId;
+        @ApiModelProperty("组别信息 1小学、2中学、3高职院校、4本科院校、5俱乐部")
+        private int groupRemark;
         @ApiModelProperty("选手姓名")
         private String playerName;
         @ApiModelProperty("性别 0女 1男")
@@ -127,4 +129,15 @@ public class ProvinceCompeteDto {
         @ApiModelProperty("教练证")
         private Long coachCertificate; //教练证（只有教练需要，文件类型）
     }
+
+    @Data
+    @ApiModel("查找团队项目下已参加的选手信息")
+    public static class GetPlayerByTeamProject{
+        @NotNull(message = "请先填写基础信息")
+        @ApiModelProperty("参赛单位id")
+        private Long companyId;
+        @NotNull(message = "请选择项目")
+        @ApiModelProperty("项目id")
+        private Long projectId;
+    }
 }

mt/src/main/java/com/ccsens/mt/bean/po/CompeteGroup.java

@@ -30,6 +30,8 @@ public class CompeteGroup implements Serializable {
 
     private Byte minAge;
 
+    private Byte groupRemark;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -136,6 +138,14 @@ public class CompeteGroup implements Serializable {
         this.minAge = minAge;
     }
 
+    public Byte getGroupRemark() {
+        return groupRemark;
+    }
+
+    public void setGroupRemark(Byte groupRemark) {
+        this.groupRemark = groupRemark;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -155,6 +165,7 @@ public class CompeteGroup implements Serializable {
         sb.append(", sex=").append(sex);
         sb.append(", maxAge=").append(maxAge);
         sb.append(", minAge=").append(minAge);
+        sb.append(", groupRemark=").append(groupRemark);
         sb.append("]");
         return sb.toString();
     }

mt/src/main/java/com/ccsens/mt/bean/po/CompeteGroupExample.java

@@ -904,6 +904,66 @@ public class CompeteGroupExample {
             addCriterion("min_age not between", value1, value2, "minAge");
             return (Criteria) this;
         }
+
+        public Criteria andGroupRemarkIsNull() {
+            addCriterion("group_remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkIsNotNull() {
+            addCriterion("group_remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkEqualTo(Byte value) {
+            addCriterion("group_remark =", value, "groupRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkNotEqualTo(Byte value) {
+            addCriterion("group_remark <>", value, "groupRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkGreaterThan(Byte value) {
+            addCriterion("group_remark >", value, "groupRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkGreaterThanOrEqualTo(Byte value) {
+            addCriterion("group_remark >=", value, "groupRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkLessThan(Byte value) {
+            addCriterion("group_remark <", value, "groupRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkLessThanOrEqualTo(Byte value) {
+            addCriterion("group_remark <=", value, "groupRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkIn(List<Byte> values) {
+            addCriterion("group_remark in", values, "groupRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkNotIn(List<Byte> values) {
+            addCriterion("group_remark not in", values, "groupRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkBetween(Byte value1, Byte value2) {
+            addCriterion("group_remark between", value1, value2, "groupRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkNotBetween(Byte value1, Byte value2) {
+            addCriterion("group_remark not between", value1, value2, "groupRemark");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayer.java

@@ -48,6 +48,8 @@ public class CompetePlayer implements Serializable {
 
     private Long insuranceRecordFile;
 
+    private Byte groupRemark;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -226,6 +228,14 @@ public class CompetePlayer implements Serializable {
         this.insuranceRecordFile = insuranceRecordFile;
     }
 
+    public Byte getGroupRemark() {
+        return groupRemark;
+    }
+
+    public void setGroupRemark(Byte groupRemark) {
+        this.groupRemark = groupRemark;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -254,6 +264,7 @@ public class CompetePlayer implements Serializable {
         sb.append(", studentRecordFile=").append(studentRecordFile);
         sb.append(", healthRecordFile=").append(healthRecordFile);
         sb.append(", insuranceRecordFile=").append(insuranceRecordFile);
+        sb.append(", groupRemark=").append(groupRemark);
         sb.append("]");
         return sb.toString();
     }

mt/src/main/java/com/ccsens/mt/bean/po/CompetePlayerExample.java

@@ -1484,6 +1484,66 @@ public class CompetePlayerExample {
             addCriterion("insurance_record_file not between", value1, value2, "insuranceRecordFile");
             return (Criteria) this;
         }
+
+        public Criteria andGroupRemarkIsNull() {
+            addCriterion("group_remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkIsNotNull() {
+            addCriterion("group_remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkEqualTo(Byte value) {
+            addCriterion("group_remark =", value, "groupRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkNotEqualTo(Byte value) {
+            addCriterion("group_remark <>", value, "groupRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkGreaterThan(Byte value) {
+            addCriterion("group_remark >", value, "groupRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkGreaterThanOrEqualTo(Byte value) {
+            addCriterion("group_remark >=", value, "groupRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkLessThan(Byte value) {
+            addCriterion("group_remark <", value, "groupRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkLessThanOrEqualTo(Byte value) {
+            addCriterion("group_remark <=", value, "groupRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkIn(List<Byte> values) {
+            addCriterion("group_remark in", values, "groupRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkNotIn(List<Byte> values) {
+            addCriterion("group_remark not in", values, "groupRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkBetween(Byte value1, Byte value2) {
+            addCriterion("group_remark between", value1, value2, "groupRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupRemarkNotBetween(Byte value1, Byte value2) {
+            addCriterion("group_remark not between", value1, value2, "groupRemark");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -93,4 +93,12 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper {
      * @return 返回详细信息
      */
     ProvinceCompeteVo.GetCoach getCoachInfo(@Param("coachId")Long coachId);
+
+    /**
+     * 查找团队项目下的参赛选手信息
+     * @param projectId
+     * @param type
+     * @return
+     */
+    List<ProvinceCompeteVo.GroupAndPlayer> getPlayerByTeamProject(@Param("projectId")Long projectId, @Param("type")Byte type);
 }

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

@@ -131,4 +131,11 @@ public interface IProvinceService {
      * @return 返回详细信息
      */
     ProvinceCompeteVo.GetCoach getCoachInfo(CompeteDto.LeaderId param);
+
+    /**
+     * 查找团队项目下已参加的选手信息
+     * @param param 单位id和团体项目id
+     * @return 返回参加的选手的详细信息，按组别分类
+     */
+    List<ProvinceCompeteVo.GroupAndPlayer> getPlayerByTeamProject(ProvinceCompeteDto.GetPlayerByTeamProject param);
 }

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

@@ -119,8 +119,9 @@ public class ProvinceService implements IProvinceService {
             CompetePlayer player = new CompetePlayer();
             player.setId(snowflake.nextId());
             player.setName(param.getPlayerName());
-            player.setGender((byte) param.getGender());
 
+
+            if(ObjectUtil.isNull(param.getCompeteId())){ throw new BaseException(CodeEnum.NOT_COMPANY); }
             //身份证不能为空，且正确
             if(StrUtil.isEmpty(param.getIdCard()) || !IdcardUtil.isValidCard(param.getIdCard())){throw new BaseException(CodeEnum.ID_CARD_ERROR);}
             //是否已注册
@@ -129,14 +130,26 @@ public class ProvinceService implements IProvinceService {
             if(competePlayerDao.countByExample(competePlayerExample) != 0){
                 throw new BaseException(CodeEnum.ID_CARD_ALREADY);
             }
-
+            //验证性别是否正确
-            if(ObjectUtil.isNull(param.getCompeteId())){ throw new BaseException(CodeEnum.NOT_COMPANY); }
+            int gender = IdcardUtil.getGenderByIdCard(param.getIdCard());
-            if(ObjectUtil.isNull(param.getGroupId())){ throw new BaseException(CodeEnum.MT_NOT_GROUP); }
+            if(gender != param.getGender()){
-            //检查性别与组别是否匹配
+                throw new BaseException(CodeEnum.GENDER_ERROR);
-            CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(param.getGroupId());
+            }
-            if(ObjectUtil.isNull(competeGroup) || param.getGender() != competeGroup.getSex()){
+            //通过groupRemark和性别查找选手组别信息
-                throw new BaseException(CodeEnum.MT_NOT_GROUP);
+            CompeteGroup competeGroup = new CompeteGroup();
-            }
+            CompeteGroupExample competeGroupExample = new CompeteGroupExample();
+            competeGroupExample.createCriteria().andSexEqualTo((byte) param.getGender()).andGroupRemarkEqualTo((byte) param.getGroupRemark());
+            List<CompeteGroup> groupList = competeGroupMapper.selectByExample(competeGroupExample);
+            if(CollectionUtil.isNotEmpty(groupList)){
+                competeGroup = groupList.get(0);
+            }
+//            if(ObjectUtil.isNull(param.getGroupId())){ throw new BaseException(CodeEnum.MT_NOT_GROUP); }
+
+//            //检查性别与组别是否匹配
+//            CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(param.getGroupId());
+//            if(ObjectUtil.isNull(competeGroup) || param.getGender() != competeGroup.getSex()){
+//                throw new BaseException(CodeEnum.MT_NOT_GROUP);
+//            }
             //获取选手年龄
             int ageByIdCard = IdcardUtil.getAgeByIdCard(param.getIdCard());
             //判断年龄和分组是否匹配
@@ -153,28 +166,17 @@ public class ProvinceService implements IProvinceService {
             if(ObjectUtil.isNull(param.getStudentRecord())){ throw new BaseException(CodeEnum.PHOTO_IS_EMPTY.mtMsgPhoto("学籍证明")); }
             if(ObjectUtil.isNull(param.getHealthRecord())){ throw new BaseException(CodeEnum.PHOTO_IS_EMPTY.mtMsgPhoto("健康证明")); }
             if(ObjectUtil.isNull(param.getInsuranceRecord())){ throw new BaseException(CodeEnum.PHOTO_IS_EMPTY.mtMsgPhoto("保险证明")); }
+            player.setGender((byte) param.getGender());
             player.setIdCard(param.getIdCard());
             player.setCompanyId(param.getCompeteId());
             player.setCompeteGroupId(param.getGroupId());
+            player.setGroupRemark((byte) param.getGroupRemark());
             player.setIdCardFrontFile(param.getIdCardFront());
             player.setIdCardBackFile(param.getIdCardBack());
             player.setIdPhotoFile(param.getIdPhone());
             player.setStudentRecordFile(param.getStudentRecord());
             player.setHealthRecordFile(param.getHealthRecord());
             player.setInsuranceRecordFile(param.getInsuranceRecord());
-
-//            //添加身份证正面照片
-//            player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId));
-//            //身份证反面
-//            player.setIdCardBackFile(uploadPhotoFile(param.getIdCardFront(),userId));
-//            //一寸证件照
-//            player.setIdPhotoFile(uploadPhotoFile(param.getIdCardFront(),userId));
-//            //学籍证明
-//            player.setStudentRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
-//            //健康证明
-//            player.setHealthRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
-//            //保险证明
-//            player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
             competePlayerDao.insertSelective(player);
             log.info("新加参赛选手：{}",player);
         }else {
@@ -182,6 +184,31 @@ public class ProvinceService implements IProvinceService {
             CompetePlayer player = competePlayerDao.selectByPrimaryKey(param.getPlayerId());
             log.info("查找需要修改的选手信息：{}",player);
             if(ObjectUtil.isNull(player)){ throw new BaseException(CodeEnum.PARAM_ERROR); }
+            //身份证不能为空，且正确
+            if(!IdcardUtil.isValidCard(param.getIdCard())){throw new BaseException(CodeEnum.ID_CARD_ERROR);}
+            //是否已注册
+            CompetePlayerExample competePlayerExample = new CompetePlayerExample();
+            competePlayerExample.createCriteria().andIdCardEqualTo(param.getIdCard()).andIdNotEqualTo(param.getPlayerId());
+            if(competePlayerDao.countByExample(competePlayerExample) != 0){throw new BaseException(CodeEnum.ID_CARD_ALREADY);}
+            //验证性别是否正确
+            int gender = IdcardUtil.getGenderByIdCard(param.getIdCard());
+            if(gender != param.getGender()){
+                throw new BaseException(CodeEnum.GENDER_ERROR);
+            }
+            //通过groupRemark和性别查找选手组别信息
+            CompeteGroup competeGroup = new CompeteGroup();
+            CompeteGroupExample competeGroupExample = new CompeteGroupExample();
+            competeGroupExample.createCriteria().andSexEqualTo((byte) param.getGender()).andGroupRemarkEqualTo((byte) param.getGroupRemark());
+            List<CompeteGroup> groupList = competeGroupMapper.selectByExample(competeGroupExample);
+            if(CollectionUtil.isNotEmpty(groupList)){
+                competeGroup = groupList.get(0);
+            }
+            //获取选手年龄
+            int ageByIdCard = IdcardUtil.getAgeByIdCard(param.getIdCard());
+            //判断年龄和分组是否匹配
+            if(ageByIdCard < competeGroup.getMinAge() || ageByIdCard > competeGroup.getMaxAge()){
+                throw new BaseException(CodeEnum.MT_NOT_GROUP);
+            }
             //字段不为空则修改
             if(StrUtil.isNotEmpty(param.getPlayerName())){player.setName(param.getPlayerName());}
             if(StrUtil.isNotEmpty(param.getIdCard())){player.setIdCard(param.getIdCard());}
@@ -195,13 +222,6 @@ public class ProvinceService implements IProvinceService {
             if(ObjectUtil.isNotNull(param.getStudentRecord())){player.setStudentRecordFile(param.getStudentRecord());}
             if(ObjectUtil.isNotNull(param.getHealthRecord())){player.setHealthRecordFile(param.getHealthRecord());}
             if(ObjectUtil.isNotNull(param.getInsuranceRecord())){player.setInsuranceRecordFile(param.getInsuranceRecord());}
-
-//            if(ObjectUtil.isNotNull(param.getIdCardFront())){player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId));}
-//            if(ObjectUtil.isNotNull(param.getIdCardBack())){player.setIdCardBackFile(uploadPhotoFile(param.getIdCardFront(),userId));}
-//            if(ObjectUtil.isNotNull(param.getIdPhone())){player.setIdPhotoFile(uploadPhotoFile(param.getIdCardFront(),userId));}
-//            if(ObjectUtil.isNotNull(param.getStudentRecord())){ player.setStudentRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
-//            if(ObjectUtil.isNotNull(param.getHealthRecord())){ player.setHealthRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
-//            if(ObjectUtil.isNotNull(param.getInsuranceRecord())){ player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
             competePlayerDao.updateByPrimaryKeySelective(player);
         }
     }
@@ -606,5 +626,18 @@ public class ProvinceService implements IProvinceService {
     public ProvinceCompeteVo.GetCoach getCoachInfo(CompeteDto.LeaderId param) {
         return competeCompanyDao.getCoachInfo(param.getCoachId());
     }
+
+    /**
+     * 查找团体项目下的参赛选手信息
+     */
+    @Override
+    public List<ProvinceCompeteVo.GroupAndPlayer> getPlayerByTeamProject(ProvinceCompeteDto.GetPlayerByTeamProject param) {
+        //查找项目
+        CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId());
+        if(ObjectUtil.isNotNull(competeProject)){
+            List<ProvinceCompeteVo.GroupAndPlayer> groupAndPlayerList = competeCompanyDao.getPlayerByTeamProject(param.getProjectId(),competeProject.getType());
+        }
+        return null;
+    }
 }
 

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

@@ -232,6 +232,27 @@
         WHERE
         id = #{coachId}
     </select>
+    <select id="getPlayerByTeamProject" resultMap="group_player">
+        SELECT
+        g.id,
+        g.group_name,
+        t.project_id,
+        p.id,
+        p.`name`
+        FROM
+        t_compete_group g
+        LEFT JOIN t_compete_team t on g.sex = t.gender_group and g.group_remark = t.group_remark
+        LEFT JOIN t_compete_team_member m on t.id = m.compete_team_id
+        LEFT JOIN t_compete_player p on m.player_id = p.id
+        WHERE
+            t.project_id = #{projectId}
+            and
+            g.type = #{type}
+            and g.rec_status = 0
+            and t.rec_status = 0
+            and m.rec_status = 0
+            and p.rec_status = 0
+    </select>
 
 
 </mapper>

mt/src/main/resources/mapper_raw/CompeteGroupMapper.xml

@@ -15,6 +15,7 @@
     <result column="sex" jdbcType="TINYINT" property="sex" />
     <result column="max_age" jdbcType="TINYINT" property="maxAge" />
     <result column="min_age" jdbcType="TINYINT" property="minAge" />
+    <result column="group_remark" jdbcType="TINYINT" property="groupRemark" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -76,7 +77,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, group_name, description, start_age, end_age, sequence, type, created_at, updated_at, 
-    rec_status, sex, max_age, min_age
+    rec_status, sex, max_age, min_age, group_remark
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteGroupExample" resultMap="BaseResultMap">
     select
@@ -113,12 +114,12 @@
       start_age, end_age, sequence, 
       type, created_at, updated_at, 
       rec_status, sex, max_age, 
-      min_age)
+      min_age, group_remark)
     values (#{id,jdbcType=BIGINT}, #{groupName,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, 
       #{startAge,jdbcType=INTEGER}, #{endAge,jdbcType=INTEGER}, #{sequence,jdbcType=INTEGER}, 
       #{type,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
       #{recStatus,jdbcType=TINYINT}, #{sex,jdbcType=TINYINT}, #{maxAge,jdbcType=TINYINT}, 
-      #{minAge,jdbcType=TINYINT})
+      #{minAge,jdbcType=TINYINT}, #{groupRemark,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompeteGroup">
     insert into t_compete_group
@@ -162,6 +163,9 @@
       <if test="minAge != null">
         min_age,
       </if>
+      <if test="groupRemark != null">
+        group_remark,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -203,6 +207,9 @@
       <if test="minAge != null">
         #{minAge,jdbcType=TINYINT},
       </if>
+      <if test="groupRemark != null">
+        #{groupRemark,jdbcType=TINYINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.ccsens.mt.bean.po.CompeteGroupExample" resultType="java.lang.Long">
@@ -253,6 +260,9 @@
       <if test="record.minAge != null">
         min_age = #{record.minAge,jdbcType=TINYINT},
       </if>
+      <if test="record.groupRemark != null">
+        group_remark = #{record.groupRemark,jdbcType=TINYINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -272,7 +282,8 @@
       rec_status = #{record.recStatus,jdbcType=TINYINT},
       sex = #{record.sex,jdbcType=TINYINT},
       max_age = #{record.maxAge,jdbcType=TINYINT},
-      min_age = #{record.minAge,jdbcType=TINYINT}
+      min_age = #{record.minAge,jdbcType=TINYINT},
+      group_remark = #{record.groupRemark,jdbcType=TINYINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -316,6 +327,9 @@
       <if test="minAge != null">
         min_age = #{minAge,jdbcType=TINYINT},
       </if>
+      <if test="groupRemark != null">
+        group_remark = #{groupRemark,jdbcType=TINYINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -332,7 +346,8 @@
       rec_status = #{recStatus,jdbcType=TINYINT},
       sex = #{sex,jdbcType=TINYINT},
       max_age = #{maxAge,jdbcType=TINYINT},
-      min_age = #{minAge,jdbcType=TINYINT}
+      min_age = #{minAge,jdbcType=TINYINT},
+      group_remark = #{groupRemark,jdbcType=TINYINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

mt/src/main/resources/mapper_raw/CompetePlayerMapper.xml

@@ -24,6 +24,7 @@
     <result column="student_record_file" jdbcType="BIGINT" property="studentRecordFile" />
     <result column="health_record_file" jdbcType="BIGINT" property="healthRecordFile" />
     <result column="insurance_record_file" jdbcType="BIGINT" property="insuranceRecordFile" />
+    <result column="group_remark" jdbcType="TINYINT" property="groupRemark" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -87,7 +88,7 @@
     id, user_id, name, id_card, phone, gender, id_card_front, id_card_back, prove_img, 
     compete_group_id, company_id, authorization, created_at, updated_at, rec_status, 
     compete_time_id, id_card_front_file, id_card_back_file, id_photo_file, student_record_file, 
-    health_record_file, insurance_record_file
+    health_record_file, insurance_record_file, group_remark
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompetePlayerExample" resultMap="BaseResultMap">
     select
@@ -127,7 +128,7 @@
       created_at, updated_at, rec_status, 
       compete_time_id, id_card_front_file, id_card_back_file, 
       id_photo_file, student_record_file, health_record_file, 
-      insurance_record_file)
+      insurance_record_file, group_remark)
     values (#{id,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, 
       #{idCard,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{gender,jdbcType=TINYINT}, 
       #{idCardFront,jdbcType=VARCHAR}, #{idCardBack,jdbcType=VARCHAR}, #{proveImg,jdbcType=VARCHAR}, 
@@ -135,7 +136,7 @@
       #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, 
       #{competeTimeId,jdbcType=BIGINT}, #{idCardFrontFile,jdbcType=BIGINT}, #{idCardBackFile,jdbcType=BIGINT}, 
       #{idPhotoFile,jdbcType=BIGINT}, #{studentRecordFile,jdbcType=BIGINT}, #{healthRecordFile,jdbcType=BIGINT}, 
-      #{insuranceRecordFile,jdbcType=BIGINT})
+      #{insuranceRecordFile,jdbcType=BIGINT}, #{groupRemark,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompetePlayer">
     insert into t_compete_player
@@ -206,6 +207,9 @@
       <if test="insuranceRecordFile != null">
         insurance_record_file,
       </if>
+      <if test="groupRemark != null">
+        group_remark,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -274,6 +278,9 @@
       <if test="insuranceRecordFile != null">
         #{insuranceRecordFile,jdbcType=BIGINT},
       </if>
+      <if test="groupRemark != null">
+        #{groupRemark,jdbcType=TINYINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.ccsens.mt.bean.po.CompetePlayerExample" resultType="java.lang.Long">
@@ -351,6 +358,9 @@
       <if test="record.insuranceRecordFile != null">
         insurance_record_file = #{record.insuranceRecordFile,jdbcType=BIGINT},
       </if>
+      <if test="record.groupRemark != null">
+        group_remark = #{record.groupRemark,jdbcType=TINYINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -379,7 +389,8 @@
       id_photo_file = #{record.idPhotoFile,jdbcType=BIGINT},
       student_record_file = #{record.studentRecordFile,jdbcType=BIGINT},
       health_record_file = #{record.healthRecordFile,jdbcType=BIGINT},
-      insurance_record_file = #{record.insuranceRecordFile,jdbcType=BIGINT}
+      insurance_record_file = #{record.insuranceRecordFile,jdbcType=BIGINT},
+      group_remark = #{record.groupRemark,jdbcType=TINYINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -450,6 +461,9 @@
       <if test="insuranceRecordFile != null">
         insurance_record_file = #{insuranceRecordFile,jdbcType=BIGINT},
       </if>
+      <if test="groupRemark != null">
+        group_remark = #{groupRemark,jdbcType=TINYINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -475,7 +489,8 @@
       id_photo_file = #{idPhotoFile,jdbcType=BIGINT},
       student_record_file = #{studentRecordFile,jdbcType=BIGINT},
       health_record_file = #{healthRecordFile,jdbcType=BIGINT},
-      insurance_record_file = #{insuranceRecordFile,jdbcType=BIGINT}
+      insurance_record_file = #{insuranceRecordFile,jdbcType=BIGINT},
+      group_remark = #{groupRemark,jdbcType=TINYINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java

@@ -201,11 +201,11 @@ public class ProTaskDetailService implements IProTaskDetailService {
                 List<TaskVo.NormalTask> secondNormalTaskList = taskDetailDao.selectNormalTaskListByPM(projectId, firstTaskDetail.getId(), startTime, endTime, roleId);
                 if (CollectionUtil.isNotEmpty(secondNormalTaskList)) {
                     for (TaskVo.NormalTask task : secondNormalTaskList) {
-                        //处理分数
+//                        //处理分数
-                        BigDecimal score = mtFeignClient.getAdminScore(task.getProjectId(), task.getDetailId());
+//                        BigDecimal score = mtFeignClient.getAdminScore(task.getProjectId(), task.getDetailId());
-                        if (ObjectUtil.isNotNull(score)) {
+//                        if (ObjectUtil.isNotNull(score)) {
-                            task.setScore(score);
+//                            task.setScore(score);
-                        }
+//                        }
                         //处理插件
                         managePlugin(currentUserId, roleId, task, imitation);
                         //二级任务完成状态

util/src/main/java/com/ccsens/util/CodeEnum.java

@@ -173,7 +173,8 @@ public enum CodeEnum {
     NOT_COMPANY(142,"请先填写基础信息",true),
     MT_NOT_GROUP(143,"请选择正确的组别信息",true),
     CONTACTS_NAME_EMPTY(144,"联系人名称不能为空",true),
-    MEMBER_NUM_ERROR(144,"参赛人数不满足比赛人数要求",true),
+    MEMBER_NUM_ERROR(145,"参赛人数不满足比赛人数要求",true),
+    GENDER_ERROR(146,"请选择正确的性别",true),
 
     ;