1

cloudutil/src/main/java/com/ccsens/cloudutil/aspect/LogAspect.java

@@ -1,6 +1,9 @@
 package com.ccsens.cloudutil.aspect;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.ccsens.cloudutil.bean.tall.dto.LogDto;
+import com.ccsens.cloudutil.bean.tall.vo.UserVo;
 import com.ccsens.cloudutil.feign.TallFeignClient;
 import com.ccsens.util.UploadFileUtil_Servlet3;
 import com.ccsens.util.WebConstant;
@@ -74,6 +77,13 @@ public class LogAspect {
             throw throwable;
         }
         if (logDto != null) {
+            if("/users/signin".equals(logDto.getUrl()) && result != null){
+                JSONObject json = JSONObject.parseObject(JSON.toJSONString(result));
+                if(json.getIntValue("code") == 200 && json.get("data") != null){
+                    long userId = json.getJSONObject("data").getLongValue("id");
+                    logDto.setUserId(userId);
+                }
+            }
             String message = result == null ? null : result.toString().length() > 1000 ? result.toString().substring(0, 1000) : result.toString();
             logDto.setResult(message);
             tallFeignClient.log(logDto);

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,24 @@ public class ProvinceController {
         log.info("查询教练或领队的详细信息：{}",coachInfo);
         return JsonResponse.newInstance().ok(coachInfo);
     }
+
+    @MustLogin
+    @ApiOperation(value = "查找团体比赛已报名的选手信息", notes = "")
+    @RequestMapping(value = "/teamProject/player", 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);
+    }
+
+    @MustLogin
+    @ApiOperation(value = "团体报名查询可以参加和已经参加的选手", notes = "")
+    @RequestMapping(value = "/rule/player", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<ProvinceCompeteVo.GroupAndPlayer>> getPlayerByTeamProjectWithRule(@ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.GetPlayerByTeamProjectWithRule> params) {
+        log.info("团体报名查询可以参加和已经参加的选手：{}",params);
+        List<ProvinceCompeteVo.GroupAndPlayer> groupAndPlayer = provinceService.getPlayerByTeamProjectWithRule(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男")
@@ -150,8 +152,32 @@ public class ProvinceCompeteDto {
     }
 
     @Data
-    @ApiModel("修改日程安排")
-    public  static class UpdateAndSearchList{
+    @ApiModel("修改日程安排集合")
+    public  static class UpdateAndSearchList {
         private List<UpdateAndSearch> updateAndSearchList;
     }
+    @ApiModel("查找团队项目下已参加的选手信息")
+    public static class GetPlayerByTeamProject{
+        @NotNull(message = "请先填写基础信息")
+        @ApiModelProperty("参赛单位id")
+        private Long companyId;
+        @NotNull(message = "请选择项目")
+        @ApiModelProperty("项目id")
+        private Long projectId;
+    }
+
+    @Data
+    @ApiModel("查找团队项目下符合规则的选手信息")
+    public static class GetPlayerByTeamProjectWithRule{
+        @NotNull(message = "请先填写基础信息")
+        @ApiModelProperty("参赛单位id")
+        private Long companyId;
+        @NotNull(message = "请选择项目")
+        @ApiModelProperty("项目id")
+        private Long projectId;
+        @ApiModelProperty("性别组")
+        private int gender;
+        @ApiModelProperty("组别信息")
+        private int groupRemark;
+    }
 }

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/bean/vo/ProvinceCompeteVo.java

@@ -154,6 +154,8 @@ public class ProvinceCompeteVo {
         private Long competeId;
         @ApiModelProperty("组别id")
         private Long groupId;
+        @ApiModelProperty("组别信息")
+        private int groupRemark;
         @ApiModelProperty("选手姓名")
         private String playerName;
         @ApiModelProperty("性别")

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

@@ -96,6 +96,13 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper {
      */
     ProvinceCompeteVo.GetCoach getCoachInfo(@Param("coachId")Long coachId);
 
+    /**
+     * 查找团队项目下的参赛选手信息
+     * @param projectId
+     * @param type
+     * @return
+     */
+    List<ProvinceCompeteVo.GroupAndPlayer> getPlayerByTeamProject(@Param("projectId")Long projectId, @Param("type")Byte type);
     /**
      * 根据大赛id查看当前大赛所有队伍信息,以及联系人的信息
      * @param CompeteTimeId   大赛CompeteTimeId
@@ -109,4 +116,15 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper {
      * @return
      */
     List<CompeteCoach> selectByCompanyId(@Param("companyId")Long companyId);
+
+    /**
+     * 查找该项目下所有可以参赛和已经参赛的选手
+     * @param companyId 单位id
+     * @param projectId 项目id
+     * @param type 比赛类型
+     * @param groupRemark 组别备注信息
+     * @param gender 性别 0女 1男 2混合
+     * @return 返回选手信息
+     */
+    List<ProvinceCompeteVo.GroupAndPlayer> getPlayerByTeamProjectWithRule(@Param("companyId")Long companyId, @Param("projectId")Long projectId, @Param("type")Byte type, @Param("groupRemark")int groupRemark, @Param("gender")int gender);
 }

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

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

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

@@ -9,31 +9,24 @@ import cn.hutool.core.util.StrUtil;
 import com.ccsens.mt.bean.dto.CompeteDto;
 import com.ccsens.mt.bean.dto.ProvinceCompeteDto;
 import com.ccsens.mt.bean.po.*;
-import com.ccsens.mt.bean.vo.CompeteVo;
 import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
 import com.ccsens.mt.persist.dao.CompeteCompanyDao;
 import com.ccsens.mt.persist.dao.CompetePlayerDao;
 import com.ccsens.mt.persist.dao.CompeteTeamDao;
 import com.ccsens.mt.persist.dao.CompeteTimeDao;
 import com.ccsens.mt.persist.mapper.*;
-import com.ccsens.mt.persist.mapper.CommonFileMapper;
 import com.ccsens.mt.persist.mapper.CompeteCoachMapper;
 import com.ccsens.mt.persist.mapper.CompetePlayerMapper;
 import com.ccsens.mt.util.Constant;
 import com.ccsens.util.CodeEnum;
-import com.ccsens.util.PropUtil;
-import com.ccsens.util.UploadFileUtil_Servlet3;
 import com.ccsens.util.WebConstant;
 import com.ccsens.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
-import org.aspectj.apache.bcel.classfile.Code;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import javax.servlet.http.Part;
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -51,8 +44,6 @@ public class ProvinceService implements IProvinceService {
     @Resource
     private CompeteTimeDao competeTimeDao;
     @Resource
-    private CommonFileMapper commonFileMapper;
-    @Resource
     private CompetePlayerDao competePlayerDao;
     @Resource
     private CompeteCoachMapper competeCoachMapper;
@@ -128,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);}
             //是否已注册
@@ -138,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); }
-            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 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);
+            }
+//            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());
             //判断年龄和分组是否匹配
@@ -162,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.setCompeteGroupId(competeGroup.getId());
+            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 {
@@ -191,11 +184,37 @@ 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());}
             if(ObjectUtil.isNotNull(param.getGender())){player.setGender((byte) param.getGender());}
-            if(ObjectUtil.isNotNull(param.getGroupId())){player.setCompeteGroupId(param.getGroupId());}
+            if(ObjectUtil.isNotNull(competeGroup)){player.setCompeteGroupId(competeGroup.getId());}
+            if(ObjectUtil.isNotNull(param.getGroupRemark())){player.setGroupRemark((byte) param.getGroupRemark());}
             if(ObjectUtil.isNotNull(param.getCompeteId())){player.setCompanyId(param.getCompeteId());}
 
             if(ObjectUtil.isNotNull(param.getIdCardFront())){player.setIdCardFrontFile(param.getIdCardFront());}
@@ -204,13 +223,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);
         }
     }
@@ -226,27 +238,6 @@ public class ProvinceService implements IProvinceService {
         return competePlayerDao.queryPlayerByCompanyId(param.getCompanyId());
     }
 
-    /**
-     * 将上传的图片信息保存，并在数据库添加记录
-     */
-    private Long uploadPhotoFile(Part file,Long userId) throws Exception {
-        log.info("上传文件:{}", file.getSubmittedFileName());
-        String allowedExt = "jpg,jpeg,png";
-        String dir = PropUtil.path;
-        String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExt, dir);
-        log.info(dir+""+path);
-
-        CommonFile fileDo = new CommonFile();
-        String name = file.getSubmittedFileName();
-        fileDo.setId(snowflake.nextId());
-        fileDo.setFileName(name);
-        fileDo.setLocation(dir + File.separator + path);
-        fileDo.setUserId(userId);
-        fileDo.setVisitLocation(PropUtil.imgDomain + Constant.File.UPLOAD_URL + File.separator + path);
-        commonFileMapper.insertSelective(fileDo);
-        log.info("保存文件：{}", fileDo);
-        return fileDo.getId();
-    }
 
 
     @Override
@@ -385,29 +376,6 @@ public class ProvinceService implements IProvinceService {
         return competeCompanyHeadList;
     }
 
-//    @Override
-//    public void saveCoach(CompeteDto.AddCoach param) {
-//        CompeteCoach competeCoach = new CompeteCoach();
-//        Long companyId = param.getCompanyId();
-//        competeCoach.setCompanyId(companyId);
-//        Long cpachId = param.getCoachId();
-//        competeCoach.setId(cpachId);
-//        int identity = param.getIdentity();
-//        competeCoach.setIdentity((byte) identity);
-//        String name = param.getName();
-//        competeCoach.setName(name);
-//        int gender = param.getGender();
-//        competeCoach.setGender((byte) gender);
-//        String phone = param.getPhone();
-//        competeCoach.setPhone(phone);
-//        String idCard = param.getIdCard();
-//        competeCoach.setIdCard(idCard);
-//        Long idPhoto = param.getIdPhoto();
-//        competeCoach.setIdPhoto(idPhoto);
-//        Long coachCertificate = param.getCoachCertificate();
-//        competeCoach.setCoachCertificate(coachCertificate);
-//        competeCoachMapper.insertSelective(competeCoach);
-//    }
 
     @Override
     public void deleteCoach(CompeteDto.LeaderId param) {
@@ -424,11 +392,6 @@ public class ProvinceService implements IProvinceService {
         }else {
             throw  new BaseException(CodeEnum.PARAM_ERROR);
         }
-//        else {
-//            throw  new BaseException(CodeEnum.PARAM_ERROR);
-//        }
-
-
     }
 
     @Override
@@ -590,12 +553,11 @@ public class ProvinceService implements IProvinceService {
             CompeteTeamMemberExample example = new CompeteTeamMemberExample();
             example.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId());
             long memberNum = teamMemberMapper.countByExample(example);
-
-            if(joinCount + memberNum > competeProject.getMemberMax() ){
-                throw new BaseException(CodeEnum.MEMBER_NUM_ERROR);
-                //TODO 参赛人数不满足比赛人数要求
+            if(joinCount + memberNum > 0) {
+                if (joinCount + memberNum > competeProject.getMemberMax() || joinCount + memberNum < competeProject.getMemberMin()) {
+                    throw new BaseException(CodeEnum.MEMBER_NUM_ERROR);
+                }
             }
-
             for (int i = 0; i < param.getPlayers().size(); i++) {
                 ProvinceCompeteDto.JoinProjectPlayer joinProjectPlayer = param.getPlayers().get(i);
                 CompetePlayer player = competePlayerDao.selectByPrimaryKey(joinProjectPlayer.getPlayerId());
@@ -635,6 +597,10 @@ public class ProvinceService implements IProvinceService {
                 competeTeam.setRecStatus((byte) 2);
                 competeTeamDao.updateByPrimaryKeySelective(competeTeam);
             }else {
+                //当前参赛人数不符提示错误信息
+                if(teamMemberMapper.countByExample(memberExample) > competeProject.getMemberMax() || teamMemberMapper.countByExample(memberExample) < competeProject.getMemberMin()){
+                    throw new BaseException(CodeEnum.MEMBER_NUM_ERROR);
+                }
                 //修改团队的性别组和组别备注信息
                 ProvinceCompeteVo.TeamGroupRemark teamGroupRemark = competePlayerDao.getTeamGroupRemark(competeTeam.getId());
                 if (StrUtil.isNotEmpty(teamGroupRemark.getGroupRemark())) {
@@ -661,5 +627,45 @@ 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) {
+        List<ProvinceCompeteVo.GroupAndPlayer> groupAndPlayerList = null;
+        //查找项目
+        CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId());
+        if(ObjectUtil.isNotNull(competeProject)){
+            groupAndPlayerList = competeCompanyDao.getPlayerByTeamProject(param.getProjectId(),competeProject.getType());
+        }
+        return groupAndPlayerList;
+    }
+
+    /**
+     * 查找符合参赛规则的选手信息
+     */
+    @Override
+    public List<ProvinceCompeteVo.GroupAndPlayer> getPlayerByTeamProjectWithRule(ProvinceCompeteDto.GetPlayerByTeamProjectWithRule param) {
+        List<ProvinceCompeteVo.GroupAndPlayer> groupAndPlayerList = new ArrayList<>();
+        //查找项目
+        CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId());
+        if(ObjectUtil.isNotNull(competeProject) && competeProject.getTeam() == 1){
+            //如果同单位不限组别
+            if(competeProject.getJoinRule() == 1){
+                groupAndPlayerList = competeCompanyDao.queryPlayerByGroupId(competeProject.getType(),param.getCompanyId(),null,param.getProjectId());
+            }
+            //如果同单位限制组别
+            if(competeProject.getJoinRule() == 0){
+                /*每个单位每个组别可以报名，报名过其他组的选手不能再次报名，
+                例：1单位a同学报名了q比赛的小学男子组，a同学就无法再报名q比赛小学混合组
+                    b同学报名了r比赛的小学混合组，b同学就无法再报名r比赛的女子组和男子组，无论b同学是男还是女*/
+                //查找此单位下所有该组的选手，如果选择混合组，则男女都查找
+                //排除已经报名别的组的选手
+                groupAndPlayerList = competeCompanyDao.getPlayerByTeamProjectWithRule(param.getCompanyId(),competeProject.getId(),competeProject.getType(),param.getGroupRemark(),param.getGender());
+            }
+        }
+        return groupAndPlayerList;
+    }
 }
 

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/druid-dev.yml

@@ -32,4 +32,4 @@ spring:
       username: root
       validationQuery: SELECT 1 FROM DUAL
 #      env: CCSENS_GAME
-      env: CCSENS_TALL
+      env: CCSENS_TALL

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

@@ -50,7 +50,7 @@
         if(pp.id is null and a.mId is null,0,1) as joinProject
         FROM
 		t_compete_group cg
-        LEFT JOIN t_compete_player p on cg.id = p.compete_group_id
+        LEFT JOIN t_compete_player p on (cg.id = p.compete_group_id or (cg.sex = p.gender and cg.group_remark = p.group_remark))
         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
@@ -231,6 +231,28 @@
         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>
+
     <select id="selectByCompeteTimeId" resultType="com.ccsens.mt.bean.po.CompeteCompany">
         SELECT
             tcc.`id` as id,
@@ -261,5 +283,45 @@
         where
           tcc.`company_id`= #{companyId}
     </select>
+    <select id="getPlayerByTeamProjectWithRule" resultMap="group_player">
+		SELECT
+            g.id as groupId,
+            g.group_name as groupName,
+            p.id as playerId,
+            p.`name` as playerName,
+            if(a.tId is null,0,1) as joinProject
+        FROM
+			t_compete_group g
+            LEFT JOIN t_compete_player p on g.id = p.compete_group_id
+			LEFT JOIN
+            (
+                SELECT
+                    t.id as tId,
+                    t.gender_group as mGender,
+                    t.group_remark as mRemark,
+                    m.player_id as mPlayerId
+                FROM
+                t_compete_team t LEFT JOIN t_compete_team_member m
+                on t.id = m.compete_team_id
+                WHERE
+                    t.project_id = #{projectId}
+                and t.rec_status = 0
+                and m.rec_status = 0
+            ) a on p.id = a.mPlayerId
+			WHERE
+				g.type = #{type}
+				and p.group_remark = #{groupRemark}
+                <if test="gender == 2">
+				and p.gender in (0,1)
+                </if>
+                <if test="gender != 2">
+                    and p.gender = #{gender}
+                </if>
+				and p.company_id = #{companyId}
+				and g.rec_status = 0
+				and p.rec_status = 0
+				and (a.mRemark = #{groupRemark} or a.mRemark is null)
+				and (a.mGender = #{gender} or a.mGender is null)
+    </select>
 
 </mapper>

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

@@ -178,6 +178,7 @@
         id_card as idCard,
         company_id as competeId,
         compete_group_id as groupId,
+        group_remark as groupRemark,
         (SELECT id FROM t_common_file WHERE id = id_card_front_file) as idCardFrontId,
         (SELECT visit_location FROM t_common_file WHERE id = id_card_front_file) as idCardFront,
         (SELECT id FROM t_common_file WHERE id = id_card_back_file) as idCardBackId,
@@ -196,9 +197,7 @@
         id = #{playerId}
         and rec_status = 0
     </select>
-<<<<<<< HEAD
 
-=======
     <select id="getTeamGroupRemark" resultType="com.ccsens.mt.bean.vo.ProvinceCompeteVo$TeamGroupRemark">
         SELECT
          g.group_name as groupRemark,
@@ -265,5 +264,4 @@
         and g.rec_status in (0,1)
         ORDER BY g.sequence
     </select>
->>>>>>> c32326aa81c6ae6a4ce3e0a067a7617201458f50
 </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/bean/po/SysLog.java

@@ -22,6 +22,8 @@ public class SysLog implements Serializable {
 
     private String facility;
 
+    private Long userId;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -96,6 +98,14 @@ public class SysLog implements Serializable {
         this.facility = facility == null ? null : facility.trim();
     }
 
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -111,6 +121,7 @@ public class SysLog implements Serializable {
         sb.append(", updatedAt=").append(updatedAt);
         sb.append(", recStatus=").append(recStatus);
         sb.append(", facility=").append(facility);
+        sb.append(", userId=").append(userId);
         sb.append("]");
         return sb.toString();
     }

tall/src/main/java/com/ccsens/tall/bean/po/SysLogExample.java

@@ -694,6 +694,66 @@ public class SysLogExample {
             addCriterion("facility not between", value1, value2, "facility");
             return (Criteria) this;
         }
+
+        public Criteria andUserIdIsNull() {
+            addCriterion("user_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("user_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdEqualTo(Long value) {
+            addCriterion("user_id =", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotEqualTo(Long value) {
+            addCriterion("user_id <>", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThan(Long value) {
+            addCriterion("user_id >", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("user_id >=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThan(Long value) {
+            addCriterion("user_id <", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThanOrEqualTo(Long value) {
+            addCriterion("user_id <=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIn(List<Long> values) {
+            addCriterion("user_id in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotIn(List<Long> values) {
+            addCriterion("user_id not in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdBetween(Long value1, Long value2) {
+            addCriterion("user_id between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotBetween(Long value1, Long value2) {
+            addCriterion("user_id not between", value1, value2, "userId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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());
-                        if (ObjectUtil.isNotNull(score)) {
-                            task.setScore(score);
-                        }
+//                        //处理分数
+//                        BigDecimal score = mtFeignClient.getAdminScore(task.getProjectId(), task.getDetailId());
+//                        if (ObjectUtil.isNotNull(score)) {
+//                            task.setScore(score);
+//                        }
                         //处理插件
                         managePlugin(currentUserId, roleId, task, imitation);
                         //二级任务完成状态
@@ -275,14 +275,14 @@ public class ProTaskDetailService implements IProTaskDetailService {
 
         if (CollectionUtil.isNotEmpty(secondTaskVoList)) {
             for (TaskVo.NormalTask normalTask : secondTaskVoList) {
-                //处理分数
-                MemberVo.MemberInfo memberInfo = proMemberService.getMemberByUserIdAndProjectId(currentUserId, normalTask.getProjectId());
-                if (ObjectUtil.isNotNull(memberInfo)) {
-                    BigDecimal score = mtFeignClient.getMemberScore(normalTask.getDetailId(), memberInfo.getId());
-                    if (ObjectUtil.isNotNull(score)) {
-                        normalTask.setScore(score);
-                    }
-                }
+//                //处理分数
+//                MemberVo.MemberInfo memberInfo = proMemberService.getMemberByUserIdAndProjectId(currentUserId, normalTask.getProjectId());
+//                if (ObjectUtil.isNotNull(memberInfo)) {
+//                    BigDecimal score = mtFeignClient.getMemberScore(normalTask.getDetailId(), memberInfo.getId());
+//                    if (ObjectUtil.isNotNull(score)) {
+//                        normalTask.setScore(score);
+//                    }
+//                }
                 //处理插件
                 managePlugin(currentUserId, roleId, normalTask, imitation);
                 //任务完成状态

tall/src/main/resources/druid-dev.yml

@@ -27,7 +27,7 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-      url: jdbc:mysql://49.233.89.188:3306/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+      url: jdbc:mysql://49.233.89.188:3306/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
       username: root
       validationQuery: SELECT 1 FROM DUAL
       env: CCSENS_TALL

tall/src/main/resources/druid-prod.yml

@@ -28,7 +28,7 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-      url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8
+      url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
       username: root
       validationQuery: SELECT 1 FROM DUAL
       env: CCSENS_HEALTH

tall/src/main/resources/druid-test.yml

@@ -29,7 +29,7 @@ spring:
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
 #      url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8
-      url: jdbc:mysql://test.tall.wiki/tall?useUnicode=true&characterEncoding=UTF-8
+      url: jdbc:mysql://test.tall.wiki/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
       username: root
       validationQuery: SELECT 1 FROM DUAL
       env: CCSENS_TALL

tall/src/main/resources/mapper_raw/SysLogMapper.xml

@@ -11,6 +11,7 @@
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
     <result column="facility" jdbcType="VARCHAR" property="facility" />
+    <result column="user_id" jdbcType="BIGINT" property="userId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -71,7 +72,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, url, method_desc, params, result, created_at, updated_at, rec_status, facility
+    id, url, method_desc, params, result, created_at, updated_at, rec_status, facility, 
+    user_id
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.tall.bean.po.SysLogExample" resultMap="BaseResultMap">
     select
@@ -106,12 +108,12 @@
   <insert id="insert" parameterType="com.ccsens.tall.bean.po.SysLog">
     insert into t_sys_log (id, url, method_desc, 
       params, result, created_at, 
-      updated_at, rec_status, facility
-      )
+      updated_at, rec_status, facility, 
+      user_id)
     values (#{id,jdbcType=BIGINT}, #{url,jdbcType=VARCHAR}, #{methodDesc,jdbcType=VARCHAR}, 
       #{params,jdbcType=VARCHAR}, #{result,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, 
-      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, #{facility,jdbcType=VARCHAR}
-      )
+      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}, #{facility,jdbcType=VARCHAR}, 
+      #{userId,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.SysLog">
     insert into t_sys_log
@@ -143,6 +145,9 @@
       <if test="facility != null">
         facility,
       </if>
+      <if test="userId != null">
+        user_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -172,6 +177,9 @@
       <if test="facility != null">
         #{facility,jdbcType=VARCHAR},
       </if>
+      <if test="userId != null">
+        #{userId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.ccsens.tall.bean.po.SysLogExample" resultType="java.lang.Long">
@@ -210,6 +218,9 @@
       <if test="record.facility != null">
         facility = #{record.facility,jdbcType=VARCHAR},
       </if>
+      <if test="record.userId != null">
+        user_id = #{record.userId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -225,7 +236,8 @@
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{record.recStatus,jdbcType=TINYINT},
-      facility = #{record.facility,jdbcType=VARCHAR}
+      facility = #{record.facility,jdbcType=VARCHAR},
+      user_id = #{record.userId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -257,6 +269,9 @@
       <if test="facility != null">
         facility = #{facility,jdbcType=VARCHAR},
       </if>
+      <if test="userId != null">
+        user_id = #{userId,jdbcType=BIGINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -269,7 +284,8 @@
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{recStatus,jdbcType=TINYINT},
-      facility = #{facility,jdbcType=VARCHAR}
+      facility = #{facility,jdbcType=VARCHAR},
+      user_id = #{userId,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

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),
 
     ;