20201028v1.5

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

@@ -3,7 +3,6 @@ package com.ccsens.mt.api;
 import com.ccsens.cloudutil.annotation.MustLogin;
 import com.ccsens.mt.bean.dto.CompeteDto;
 import com.ccsens.mt.bean.dto.ProvinceCompeteDto;
-import com.ccsens.mt.bean.vo.CompeteVo;
 import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
 import com.ccsens.mt.service.IProvinceService;
 import com.ccsens.util.JsonResponse;
@@ -106,13 +105,50 @@ public class ProvinceController {
     @MustLogin
     @ApiOperation(value = "添加/修改单位信息", notes = "")
     @RequestMapping(value = "/save/company", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
-    public JsonResponse<ProvinceCompeteVo.CompeteOverview> saveCompany(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteCompany> params) {
+    public JsonResponse<ProvinceCompeteVo.CompeteCompany> saveCompany(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteCompany> params) {
         log.info("添加/修改单位信息：{}",params);
         ProvinceCompeteVo.CompeteCompany competeCompany = provinceService.changeCompany(params.getParam());
         log.info("添加/修改单位信息：{}",competeCompany);
         return JsonResponse.newInstance().ok(competeCompany);
     }
 
+    @MustLogin
+    @ApiOperation(value = "查找此单位的领队和教练信息", notes = "")
+    @RequestMapping(value = "/query/coach", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<ProvinceCompeteVo.CompeteCompanyCoach> queryCoach(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteCompany> params) {
+        log.info("查找此单位的领队和教练信息：{}",params);
+        ProvinceCompeteVo.CompeteCompanyCoach competeCompanyCoach = provinceService.queryCoach(params.getParam());
+        log.info("查找此单位的领队和教练信息：{}",competeCompanyCoach);
+        return JsonResponse.newInstance().ok(competeCompanyCoach);
+    }
 
+    @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 = "")
+    @RequestMapping(value = "/delete/coach", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse  deleteCoach(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.AddCoach> params) {
+        log.info("删除领队和教练信息：{}",params);
+        provinceService.deleteCoach(params.getParam());
+        log.info("删除领队和教练信息：{}","删除成功");
+        return JsonResponse.newInstance().ok();
+    }
+
+    @MustLogin
+    @ApiOperation(value = "参加比赛", notes = "")
+    @RequestMapping(value = "/join", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse playerJoinProject(@ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.JoinProject> params) {
+        log.info("参加比赛：{}",params);
+        provinceService.playerJoinProject(params.getParam());
+        return JsonResponse.newInstance().ok();
+    }
 
 }

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

@@ -249,5 +249,27 @@ public class CompeteDto {
         private int authorization;
     }
 
+    @Data
+    @ApiModel("当前用户参赛单位基本信息")
+    public static class AddCoach{
+        @ApiModelProperty("参赛单位id")
+        private Long companyId;
+        @ApiModelProperty("教练或领队的id，有则修改，没有则添加")
+        private Long coachId;
+        @ApiModelProperty("身份: 0领队 1教练")
+        private int identity ;
+        @ApiModelProperty("姓名")
+        private String name ;
+        @ApiModelProperty("性别")
+        private int gender ;
+        @ApiModelProperty("手机号")
+        private String phone ;
+        @ApiModelProperty("身份证号")
+        private String idCard;
+        @ApiModelProperty("证件照（文件类型")
+        private Long idPhoto;
+        @ApiModelProperty("教练证（只有教练需要，文件类型")
+        private Long coachCertificate;
+    }
 
 }

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

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import javax.servlet.http.Part;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @author 逗
@@ -57,16 +58,42 @@ public class ProvinceCompeteDto {
         @ApiModelProperty("身份证号")
         private String idCard;
         @ApiModelProperty("身份证正面照片")
-        private Part idCardFront;
+        private Long idCardFront;
         @ApiModelProperty("身份证反面照片")
-        private Part idCardBack;
+        private Long idCardBack;
         @ApiModelProperty("证件照")
-        private Part idPhone;
+        private Long idPhone;
         @ApiModelProperty("学籍照片")
-        private Part studentRecord;
+        private Long studentRecord;
         @ApiModelProperty("体检证明照片")
-        private Part healthRecord;
+        private Long healthRecord;
         @ApiModelProperty("保险证明照片")
-        private Part insuranceRecord;
+        private Long insuranceRecord;
+//        @ApiModelProperty("身份证正面照片")
+//        private Part idCardFront;
+//        @ApiModelProperty("身份证反面照片")
+//        private Part idCardBack;
+//        @ApiModelProperty("证件照")
+//        private Part idPhone;
+//        @ApiModelProperty("学籍照片")
+//        private Part studentRecord;
+//        @ApiModelProperty("体检证明照片")
+//        private Part healthRecord;
+//        @ApiModelProperty("保险证明照片")
+//        private Part insuranceRecord;
     }
+    @Data
+    @ApiModel("选择选手参加项目")
+    public static class JoinProject{
+        @NotNull
+        @ApiModelProperty("大赛id")
+        private Long competeTimeId ;
+        @ApiModelProperty("项目id")
+        private Long projectId;
+        @ApiModelProperty("单位id")
+        private Long companyId;
+        @ApiModelProperty("选手id")
+        private List<Long> playerId;
+    }
+
 }

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

@@ -28,6 +28,8 @@ public class CompeteTeam implements Serializable {
 
     private Byte success;
 
+    private Long companyId;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -126,6 +128,14 @@ public class CompeteTeam implements Serializable {
         this.success = success;
     }
 
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -144,6 +154,7 @@ public class CompeteTeam implements Serializable {
         sb.append(", recStatus=").append(recStatus);
         sb.append(", competeGroupId=").append(competeGroupId);
         sb.append(", success=").append(success);
+        sb.append(", companyId=").append(companyId);
         sb.append("]");
         return sb.toString();
     }

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

@@ -834,6 +834,66 @@ public class CompeteTeamExample {
             addCriterion("success not between", value1, value2, "success");
             return (Criteria) this;
         }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("company_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("company_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(Long value) {
+            addCriterion("company_id =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(Long value) {
+            addCriterion("company_id <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(Long value) {
+            addCriterion("company_id >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("company_id >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(Long value) {
+            addCriterion("company_id <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(Long value) {
+            addCriterion("company_id <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<Long> values) {
+            addCriterion("company_id in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<Long> values) {
+            addCriterion("company_id not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(Long value1, Long value2) {
+            addCriterion("company_id between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(Long value1, Long value2) {
+            addCriterion("company_id not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -25,6 +25,8 @@ public class ProvinceCompeteVo {
         private int guideNum;
         @ApiModelProperty("当前添加的参赛人员的人数")
         private int playerNum;
+        @ApiModelProperty("当前报名的项目数量")
+        private int projectNum;
     }
 
     @Data
@@ -104,4 +106,21 @@ public class ProvinceCompeteVo {
         @ApiModelProperty("参赛人员的人数")
         private int playerNum;
     }
+    @Data
+
+    @ApiModel("查询当前用户参赛单位基本信息")
+    public static class CompeteCompanyCoach {
+        @ApiModelProperty("教练id")
+        private Long coachId;
+        @ApiModelProperty("领队id")
+        private Long guideId;
+        @ApiModelProperty("教练名字")
+        private String coachName;
+        @ApiModelProperty("领队名字")
+        private String guideName;
+        @ApiModelProperty("性别")
+        private int gender;
+        @ApiModelProperty("联系方式")
+        private String phone;
+    }
 }

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

@@ -56,6 +56,27 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper {
 
     ProvinceCompeteVo.CompeteCompany getCompany(@Param("competeTimeId")long competeTimeId,@Param("userId")long userId);
 
-    void saveCompany (ProvinceCompeteVo.CompeteCompany competeCompany);
+    /**
+     * 查看单位报名的项目的数量
+     * @param companyId 单位id
+     * @return 返回单位参加的项目的数量
+     */
+    int getJoinProjectNum(@Param("competeTimeId")Long companyId);
+
+    /**
+     * 查找单位在某项目下的某个组别的参赛数量（个人项目）
+     * @param projectId 项目id
+     * @param companyId 单位id
+     * @param groupId 组别id
+     * @return 返回参加的数量
+     */
+    int getNumByCompanyAndGroup(@Param("projectId")Long projectId, @Param("companyId")Long companyId, @Param("groupId")Long groupId,@Param("competeTimeId")Long competeTimeId);
 
+    /**
+     * 查看此用户在这届大赛参加了几个团队项目
+     * @param competeTimeId 大赛id
+     * @param playerId 选手id
+     * @return 参加的数量
+     */
+    int getTeamNumByPlayerId(@Param("competeTimeId")Long competeTimeId, @Param("playerId")Long playerId);
 }

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

@@ -2,7 +2,6 @@ package com.ccsens.mt.service;
 
 import com.ccsens.mt.bean.dto.CompeteDto;
 import com.ccsens.mt.bean.dto.ProvinceCompeteDto;
-import com.ccsens.mt.bean.vo.CompeteVo;
 import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
 
 import java.util.List;
@@ -76,4 +75,33 @@ public interface IProvinceService {
     ProvinceCompeteVo.CompeteCompany changeCompany(CompeteDto.CompeteCompany param);
 
 
+    /**
+     * 查找此单位的领队和教练信息
+     * @param
+     * @param
+     * @return
+     */
+    ProvinceCompeteVo.CompeteCompanyCoach queryCoach(CompeteDto.CompeteCompany param);
+
+    /**
+     * 添加领队和教练信息
+     * @param
+     * @param
+     * @return
+     */
+    void saveCoach(CompeteDto.AddCoach param);
+
+    /**
+     * 删除领队和教练信息
+     * @param
+     * @param
+     * @return
+     */
+    void deleteCoach(CompeteDto.AddCoach param);
+
+    /**
+     * 选择选手参加比赛
+     * @param param 选手id和项目id
+     */
+    void playerJoinProject(ProvinceCompeteDto.JoinProject param);
 }

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

@@ -1,225 +1,397 @@
-package com.ccsens.mt.service;
+package com.ccsens.mt.service;
-
+
-import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.IdcardUtil;
-import com.ccsens.mt.bean.dto.CompeteDto;
+import cn.hutool.core.util.ObjectUtil;
-import com.ccsens.mt.bean.dto.ProvinceCompeteDto;
+import cn.hutool.core.util.StrUtil;
-import com.ccsens.mt.bean.po.*;
+import com.ccsens.mt.bean.dto.CompeteDto;
-import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
+import com.ccsens.mt.bean.dto.ProvinceCompeteDto;
-import com.ccsens.mt.persist.dao.CompeteCompanyDao;
+import com.ccsens.mt.bean.po.*;
-import com.ccsens.mt.persist.dao.CompetePlayerDao;
+import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
-import com.ccsens.mt.persist.dao.CompeteTimeDao;
+import com.ccsens.mt.persist.dao.CompeteCompanyDao;
-import com.ccsens.mt.persist.mapper.CommonFileMapper;
+import com.ccsens.mt.persist.dao.CompetePlayerDao;
-import com.ccsens.mt.util.Constant;
+import com.ccsens.mt.persist.dao.CompeteTeamDao;
-import com.ccsens.util.CodeEnum;
+import com.ccsens.mt.persist.dao.CompeteTimeDao;
-import com.ccsens.util.PropUtil;
+import com.ccsens.mt.persist.mapper.*;
-import com.ccsens.util.UploadFileUtil_Servlet3;
+import com.ccsens.mt.util.Constant;
-import com.ccsens.util.exception.BaseException;
+import com.ccsens.util.CodeEnum;
-import lombok.extern.slf4j.Slf4j;
+import com.ccsens.util.PropUtil;
-import org.springframework.stereotype.Service;
+import com.ccsens.util.UploadFileUtil_Servlet3;
-import org.springframework.transaction.annotation.Propagation;
+import com.ccsens.util.exception.BaseException;
-import org.springframework.transaction.annotation.Transactional;
+import lombok.extern.slf4j.Slf4j;
-
+import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
+import org.springframework.transaction.annotation.Propagation;
-import javax.servlet.http.Part;
+import org.springframework.transaction.annotation.Transactional;
-import java.io.File;
+
-import java.util.ArrayList;
+import javax.annotation.Resource;
-import java.util.List;
+import javax.servlet.http.Part;
-
+import java.io.File;
-/**
+import java.util.ArrayList;
- * @author 逗
+import java.util.List;
- */
+
-@Slf4j
+/**
-@Service
+ * @author 逗
-@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+ */
-public class ProvinceService implements IProvinceService {
+@Slf4j
-    @Resource
+@Service
-    private CompeteCompanyDao competeCompanyDao;
+@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
-    @Resource
+public class ProvinceService implements IProvinceService {
-    private Snowflake snowflake;
+    @Resource
-    @Resource
+    private CompeteCompanyDao competeCompanyDao;
-    private CompeteTimeDao competeTimeDao;
+    @Resource
-    @Resource
+    private Snowflake snowflake;
-    private CommonFileMapper commonFileMapper;
+    @Resource
-    @Resource
+    private CompeteTimeDao competeTimeDao;
-    private CompetePlayerDao competePlayerDao;
+    @Resource
-
+    private CommonFileMapper commonFileMapper;
-    /**
+    @Resource
-     * 查找当前用户填写的信息的概览
+    private CompetePlayerDao competePlayerDao;
-     */
+    @Resource
-    @Override
+    private CompeteCoachMapper competeCoachMapper;
-    public ProvinceCompeteVo.CompeteOverview getOverview(CompeteDto.CompeteTime param, Long userId) {
+    @Resource
-        return competeCompanyDao.getCompanyOverview(param.getCompeteTimeId(),userId);
+    private CompeteProjectMapper competeProjectMapper;
-    }
+    @Resource
-
+    private CompeteProjectPlayerMapper projectPlayerMapper;
-    /**
+    @Resource
-     * 通过组别id查找本单位的注册选手
+    private CompeteTeamDao competeTeamDao;
-     */
+    @Resource
-    @Override
+    private CompeteTeamMemberMapper teamMemberMapper;
-    public List<ProvinceCompeteVo.GroupAndPlayer> queryPlayerByGroupId(ProvinceCompeteDto.QueryPlayerByGroup param, Long userId) {
+
-        return competeCompanyDao.queryPlayerByGroupId(param.getCompanyId(),param.getGroupId(),param.getProjectId());
+    /**
-    }
+     * 查找当前用户填写的信息的概览
-
+     */
-
+    @Override
-    /**
+    public ProvinceCompeteVo.CompeteOverview getOverview(CompeteDto.CompeteTime param, Long userId) {
-     * 查找一级项目
+        ProvinceCompeteVo.CompeteOverview competeOverview = competeCompanyDao.getCompanyOverview(param.getCompeteTimeId(),userId);
-     */
+        if(ObjectUtil.isNotNull(competeOverview)){
-    @Override
+            competeOverview.setProjectNum(competeCompanyDao.getJoinProjectNum(competeOverview.getCompanyId()));
-    public List<ProvinceCompeteVo.FirstProject> queryFirstProjectByCompeteTimeId(CompeteDto.CompeteTime param, Long userId) {
+        }
-        List<ProvinceCompeteVo.FirstProject> firstProjects = new ArrayList<>();
+        return competeOverview;
-        //根据比赛类型查找大赛id
+    }
-        CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(param.getCompeteTimeId());
+
-        if(ObjectUtil.isNotNull(competeTime)){
+    /**
-            firstProjects = competeCompanyDao.queryFirstProjectByCompeteTimeId(competeTime.getType());
+     * 通过组别id查找本单位的注册选手
-        }
+     */
-        return firstProjects;
+    @Override
-    }
+    public List<ProvinceCompeteVo.GroupAndPlayer> queryPlayerByGroupId(ProvinceCompeteDto.QueryPlayerByGroup param, Long userId) {
-
+        return competeCompanyDao.queryPlayerByGroupId(param.getCompanyId(),param.getGroupId(),param.getProjectId());
-    @Override
+    }
-    public List<ProvinceCompeteVo.CompeteSecondProject> queryProjectByFirstProject(ProvinceCompeteDto.FirstProject param, Long userId) {
+
-        return competeCompanyDao.queryProjectByFirstProject(param.getFirstProjectId());
+
-    }
+    /**
-
+     * 查找一级项目
-    /**
+     */
-     * 添加或修改选手
+    @Override
-     */
+    public List<ProvinceCompeteVo.FirstProject> queryFirstProjectByCompeteTimeId(CompeteDto.CompeteTime param, Long userId) {
-    @Override
+        List<ProvinceCompeteVo.FirstProject> firstProjects = new ArrayList<>();
-    public void saveOrUpdatePlayer(ProvinceCompeteDto.PlayerInfo param, Long userId) throws Exception {
+        //根据比赛类型查找大赛id
-        //判断选手id是否为空
+        CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(param.getCompeteTimeId());
-        if(ObjectUtil.isNull(param.getPlayerId())){
+        if(ObjectUtil.isNotNull(competeTime)){
-            //id为空，新加一个选手
+            firstProjects = competeCompanyDao.queryFirstProjectByCompeteTimeId(competeTime.getType());
-            CompetePlayer player = new CompetePlayer();
+        }
-            player.setId(snowflake.nextId());
+        return firstProjects;
-            player.setName(param.getPlayerName());
+    }
-            player.setGender((byte) param.getGender());
+
-            player.setIdCard(param.getIdCard());
+    @Override
-            player.setCompanyId(param.getCompeteId());
+    public List<ProvinceCompeteVo.CompeteSecondProject> queryProjectByFirstProject(ProvinceCompeteDto.FirstProject param, Long userId) {
-            player.setCompeteGroupId(param.getGroupId());
+        return competeCompanyDao.queryProjectByFirstProject(param.getFirstProjectId());
-            //添加身份证正面照片
+    }
-            player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId));
+
-            //身份证反面
+    /**
-            player.setIdCardBackFile(uploadPhotoFile(param.getIdCardFront(),userId));
+     * 添加或修改选手
-            //一寸证件照
+     */
-            player.setIdPhotoFile(uploadPhotoFile(param.getIdCardFront(),userId));
+    @Override
-            //学籍证明
+    public void saveOrUpdatePlayer(ProvinceCompeteDto.PlayerInfo param, Long userId) {
-            player.setStudentRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
+        //判断选手id是否为空
-            //健康证明
+        if(ObjectUtil.isNull(param.getPlayerId())){
-            player.setHealthRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
+            //id为空，新加一个选手
-            //保险证明
+            CompetePlayer player = new CompetePlayer();
-            player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
+            player.setId(snowflake.nextId());
-            competePlayerDao.insertSelective(player);
+            player.setName(param.getPlayerName());
-            log.info("新加参赛选手：{}",player);
+            player.setGender((byte) param.getGender());
-        }else {
+            //身份证不能为空，且正确
-            //否则修改选手信息
+            if(StrUtil.isEmpty(param.getIdCard()) || !IdcardUtil.isValidCard(param.getIdCard())){throw new BaseException(CodeEnum.ID_CARD_ERROR);}
-            CompetePlayer player = competePlayerDao.selectByPrimaryKey(param.getPlayerId());
+            //是否已注册
-            log.info("查找需要修改的选手信息：{}",player);
+            CompetePlayerExample competePlayerExample = new CompetePlayerExample();
-            if(ObjectUtil.isNull(player)){ throw new BaseException(CodeEnum.PARAM_ERROR); }
+            competePlayerExample.createCriteria().andIdCardEqualTo(param.getIdCard());
-            //字段不为空则修改
+            if(competePlayerDao.countByExample(competePlayerExample) != 0){
-            if(StrUtil.isNotEmpty(param.getPlayerName())){player.setName(param.getPlayerName());}
+                throw new BaseException(CodeEnum.WBS_REPEAT_MEMBER_PHONE);
-            if(StrUtil.isNotEmpty(param.getIdCard())){player.setIdCard(param.getIdCard());}
+            }
-            if(ObjectUtil.isNotNull(param.getGender())){player.setGender((byte) param.getGender());}
+            player.setIdCard(param.getIdCard());
-            if(ObjectUtil.isNotNull(param.getGroupId())){player.setCompeteGroupId(param.getGroupId());}
+            player.setCompanyId(param.getCompeteId());
-            if(ObjectUtil.isNotNull(param.getCompeteId())){player.setCompanyId(param.getCompeteId());}
+            player.setCompeteGroupId(param.getGroupId());
-            if(ObjectUtil.isNotNull(param.getIdCardFront())){player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId));}
+            player.setIdCardFrontFile(param.getIdCardFront());
-            if(ObjectUtil.isNotNull(param.getIdCardBack())){player.setIdCardBackFile(uploadPhotoFile(param.getIdCardFront(),userId));}
+            player.setIdCardBackFile(param.getIdCardBack());
-            if(ObjectUtil.isNotNull(param.getIdPhone())){player.setIdPhotoFile(uploadPhotoFile(param.getIdCardFront(),userId));}
+            player.setIdPhotoFile(param.getIdPhone());
-            if(ObjectUtil.isNotNull(param.getStudentRecord())){ player.setStudentRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
+            player.setStudentRecordFile(param.getStudentRecord());
-            if(ObjectUtil.isNotNull(param.getHealthRecord())){ player.setHealthRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
+            player.setHealthRecordFile(param.getHealthRecord());
-            if(ObjectUtil.isNotNull(param.getInsuranceRecord())){ player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
+            player.setInsuranceRecordFile(param.getInsuranceRecord());
-            competePlayerDao.updateByPrimaryKeySelective(player);
+//            //添加身份证正面照片
-        }
+//            player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId));
-    }
+//            //身份证反面
-
+//            player.setIdCardBackFile(uploadPhotoFile(param.getIdCardFront(),userId));
-    /**
+//            //一寸证件照
-     * 查找所有选手
+//            player.setIdPhotoFile(uploadPhotoFile(param.getIdCardFront(),userId));
-     * @param param 单位id
+//            //学籍证明
-     * @param userId userId
+//            player.setStudentRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
-     * @return
+//            //健康证明
-     */
+//            player.setHealthRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
-    @Override
+//            //保险证明
-    public List<ProvinceCompeteVo.PlayerByCompanyId> queryPlayerByCompanyId(ProvinceCompeteDto.CompanyIdVo param, Long userId) {
+//            player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));
-        return competePlayerDao.queryPlayerByCompanyId(param.getCompanyId());
+            competePlayerDao.insertSelective(player);
-    }
+            log.info("新加参赛选手：{}",player);
-
+        }else {
-    /**
+            //否则修改选手信息
-     * 将上传的图片信息保存，并在数据库添加记录
+            CompetePlayer player = competePlayerDao.selectByPrimaryKey(param.getPlayerId());
-     */
+            log.info("查找需要修改的选手信息：{}",player);
-    private Long uploadPhotoFile(Part file,Long userId) throws Exception {
+            if(ObjectUtil.isNull(player)){ throw new BaseException(CodeEnum.PARAM_ERROR); }
-        log.info("上传文件:{}", file.getSubmittedFileName());
+            //字段不为空则修改
-        String allowedExt = "jpg,jpeg,png";
+            if(StrUtil.isNotEmpty(param.getPlayerName())){player.setName(param.getPlayerName());}
-        String dir = PropUtil.path;
+            if(StrUtil.isNotEmpty(param.getIdCard())){player.setIdCard(param.getIdCard());}
-        String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExt, dir);
+            if(ObjectUtil.isNotNull(param.getGender())){player.setGender((byte) param.getGender());}
-        log.info(dir+""+path);
+            if(ObjectUtil.isNotNull(param.getGroupId())){player.setCompeteGroupId(param.getGroupId());}
-
+            if(ObjectUtil.isNotNull(param.getCompeteId())){player.setCompanyId(param.getCompeteId());}
-        CommonFile fileDo = new CommonFile();
+
-        String name = file.getSubmittedFileName();
+            if(ObjectUtil.isNotNull(param.getIdCardFront())){player.setIdCardFrontFile(param.getIdCardFront());}
-        fileDo.setId(snowflake.nextId());
+            if(ObjectUtil.isNotNull(param.getIdCardBack())){player.setIdCardBackFile(param.getIdCardBack());}
-        fileDo.setFileName(name);
+            if(ObjectUtil.isNotNull(param.getIdPhone())){player.setIdPhotoFile(param.getIdPhone());}
-        fileDo.setLocation(dir + File.separator + path);
+            if(ObjectUtil.isNotNull(param.getStudentRecord())){player.setStudentRecordFile(param.getStudentRecord());}
-        fileDo.setUserId(userId);
+            if(ObjectUtil.isNotNull(param.getHealthRecord())){player.setHealthRecordFile(param.getHealthRecord());}
-        fileDo.setVisitLocation(PropUtil.imgDomain + Constant.File.UPLOAD_URL + File.separator + path);
+            if(ObjectUtil.isNotNull(param.getInsuranceRecord())){player.setInsuranceRecordFile(param.getInsuranceRecord());}
-        commonFileMapper.insertSelective(fileDo);
+
-        log.info("保存文件：{}", fileDo);
+//            if(ObjectUtil.isNotNull(param.getIdCardFront())){player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId));}
-        return fileDo.getId();
+//            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));}
-    @Override
+//            if(ObjectUtil.isNotNull(param.getInsuranceRecord())){ player.setInsuranceRecordFile(uploadPhotoFile(param.getIdCardFront(),userId));}
-    public ProvinceCompeteVo.CompeteCompany getCompany(CompeteDto.CompeteTime param, Long userId) {
+            competePlayerDao.updateByPrimaryKeySelective(player);
-        Long competeTimeId = param.getCompeteTimeId();
+        }
-        return competeCompanyDao.getCompany(competeTimeId,userId);
+    }
-    }
+
-
+    /**
-    @Override
+     * 查找所有选手
-    public ProvinceCompeteVo.CompeteCompany changeCompany(CompeteDto.CompeteCompany param) {
+     * @param param 单位id
-        //判断当前单位id是否为空，
+     * @param userId userId
-        Long companyid = param.getCompanyId();
+     * @return 返回选手信息
-        CompeteCompany competeCompany = new CompeteCompany();
+     */
-        ProvinceCompeteVo.CompeteCompany competeCompany1;
+    @Override
-        //单位id为空，新增
+    public List<ProvinceCompeteVo.PlayerByCompanyId> queryPlayerByCompanyId(ProvinceCompeteDto.CompanyIdVo param, Long userId) {
-        if (ObjectUtil.isNull(companyid)){
+        return competePlayerDao.queryPlayerByCompanyId(param.getCompanyId());
-            Long id = snowflake.nextId();
+    }
-            competeCompany.setId(id);
+
-            competeCompany.setCoachNum(param.getCoachNum());
+    /**
-            competeCompany.setName(param.getCompanyName());
+     * 将上传的图片信息保存，并在数据库添加记录
-            competeCompany.setContactsName(param.getContactsName());
+     */
-            competeCompany.setContactsPhone(param.getContactsPhone());
+    private Long uploadPhotoFile(Part file,Long userId) throws Exception {
-            competeCompany.setLeaderNum(param.getGuideNum());
+        log.info("上传文件:{}", file.getSubmittedFileName());
-            competeCompany.setJoinNum(param.getPlayerNum());
+        String allowedExt = "jpg,jpeg,png";
-            competeCompanyDao.insertSelective(competeCompany);
+        String dir = PropUtil.path;
-            CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample();
+        String path = UploadFileUtil_Servlet3.uploadFile(file, allowedExt, dir);
-            competeCompanyExample.createCriteria().andIdEqualTo(companyid);
+        log.info(dir+""+path);
-            competeCompany1 = (ProvinceCompeteVo.CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample);
+
-        }else {
+        CommonFile fileDo = new CommonFile();
-            //不为空，根据单位id查出来修改  判断传进来的参数是否为空 为空则跳过   不为空则修改
+        String name = file.getSubmittedFileName();
-            CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample();
+        fileDo.setId(snowflake.nextId());
-            competeCompanyExample.createCriteria().andIdEqualTo(companyid);
+        fileDo.setFileName(name);
-            competeCompany = (CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample);
+        fileDo.setLocation(dir + File.separator + path);
-            if (ObjectUtil.isNotNull(param.getCoachNum())){
+        fileDo.setUserId(userId);
-                competeCompany.setCoachNum(param.getCoachNum());
+        fileDo.setVisitLocation(PropUtil.imgDomain + Constant.File.UPLOAD_URL + File.separator + path);
-            }
+        commonFileMapper.insertSelective(fileDo);
-            if (ObjectUtil.isNotNull(param.getCompanyName())) {
+        log.info("保存文件：{}", fileDo);
-                competeCompany.setName(param.getCompanyName());
+        return fileDo.getId();
-            }
+    }
-            if (ObjectUtil.isNotNull(param.getContactsName())) {
+
-                competeCompany.setContactsName(param.getContactsName());
+
-            }
+    @Override
-            if (ObjectUtil.isNotNull(param.getContactsPhone())) {
+    public ProvinceCompeteVo.CompeteCompany getCompany(CompeteDto.CompeteTime param, Long userId) {
-                competeCompany.setContactsPhone(param.getContactsPhone());
+        Long competeTimeId = param.getCompeteTimeId();
-            }
+        return competeCompanyDao.getCompany(competeTimeId,userId);
-            if (ObjectUtil.isNotNull(param.getGuideNum())) {
+    }
-                competeCompany.setLeaderNum(param.getGuideNum());
+
-            }
+    @Override
-            if (ObjectUtil.isNotNull(param.getPlayerNum())) {
+    public ProvinceCompeteVo.CompeteCompany changeCompany(CompeteDto.CompeteCompany param) {
-                competeCompany.setJoinNum(param.getPlayerNum());
+        //判断当前单位id是否为空，
-            }
+        Long companyid = param.getCompanyId();
-            competeCompanyDao.updateByPrimaryKeySelective(competeCompany);
+        CompeteCompany competeCompany = new CompeteCompany();
-            competeCompanyExample.createCriteria().andIdEqualTo(competeCompany.getId());
+        ProvinceCompeteVo.CompeteCompany competeCompany1;
-            competeCompany1 = (ProvinceCompeteVo.CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample);
+        //单位id为空，新增
-        }
+        if (ObjectUtil.isNull(companyid)){
-        return competeCompany1;
+            Long id = snowflake.nextId();
-    }
+            competeCompany.setId(id);
-
+            competeCompany.setCoachNum(param.getCoachNum());
-}
+            competeCompany.setName(param.getCompanyName());
-
+            competeCompany.setContactsName(param.getContactsName());
+            competeCompany.setContactsPhone(param.getContactsPhone());
+            competeCompany.setLeaderNum(param.getGuideNum());
+            competeCompany.setJoinNum(param.getPlayerNum());
+            competeCompanyDao.insertSelective(competeCompany);
+            CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample();
+            competeCompanyExample.createCriteria().andIdEqualTo(companyid);
+            competeCompany1 = (ProvinceCompeteVo.CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample);
+        }else {
+            //不为空，根据单位id查出来修改  判断传进来的参数是否为空 为空则跳过   不为空则修改
+            CompeteCompanyExample competeCompanyExample = new CompeteCompanyExample();
+            competeCompanyExample.createCriteria().andIdEqualTo(companyid);
+            competeCompany = (CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample);
+            if (ObjectUtil.isNotNull(param.getCoachNum())){
+                competeCompany.setCoachNum(param.getCoachNum());
+            }
+            if (ObjectUtil.isNotNull(param.getCompanyName())) {
+                competeCompany.setName(param.getCompanyName());
+            }
+            if (ObjectUtil.isNotNull(param.getContactsName())) {
+                competeCompany.setContactsName(param.getContactsName());
+            }
+            if (ObjectUtil.isNotNull(param.getContactsPhone())) {
+                competeCompany.setContactsPhone(param.getContactsPhone());
+            }
+            if (ObjectUtil.isNotNull(param.getGuideNum())) {
+                competeCompany.setLeaderNum(param.getGuideNum());
+            }
+            if (ObjectUtil.isNotNull(param.getPlayerNum())) {
+                competeCompany.setJoinNum(param.getPlayerNum());
+            }
+            competeCompanyDao.updateByPrimaryKeySelective(competeCompany);
+            competeCompanyExample.createCriteria().andIdEqualTo(competeCompany.getId());
+            competeCompany1 = (ProvinceCompeteVo.CompeteCompany) competeCompanyDao.selectByExample(competeCompanyExample);
+        }
+        return competeCompany1;
+    }
+    @Override
+    public ProvinceCompeteVo.CompeteCompanyCoach queryCoach(CompeteDto.CompeteCompany param) {
+        Long company = param.getCompanyId();
+        CompeteCoach competeCoach = competeCoachMapper.selectByPrimaryKey(company);
+        if (ObjectUtil.isNull(competeCoach)){
+            throw new BaseException(CodeEnum.PARAM_ERROR);
+        }
+        ProvinceCompeteVo.CompeteCompanyCoach  competeCompanyCoach = new ProvinceCompeteVo.CompeteCompanyCoach();
+        if (competeCoach.getIdentity() == 0){
+            //给领队赋值
+            competeCompanyCoach.setCoachName(competeCoach.getName());
+            competeCompanyCoach.setCoachId(competeCoach.getId());
+            competeCompanyCoach.setGender(competeCoach.getGender());
+            competeCompanyCoach.setPhone(competeCoach.getPhone());
+        }else {
+            competeCompanyCoach.setGuideName(competeCoach.getName());
+            competeCompanyCoach.setCoachId(competeCoach.getId());
+            competeCompanyCoach.setGender(competeCoach.getGender());
+            competeCompanyCoach.setPhone(competeCoach.getPhone());
+        }
+        return competeCompanyCoach;
+    }
+
+    @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.AddCoach param) {
+        Long coachId = param.getCoachId();
+        CompeteCoach competeCoach = competeCoachMapper.selectByPrimaryKey(coachId);
+        competeCoachMapper.deleteByPrimaryKey(competeCoach.getId());
+    }
+
+    /**
+     * 选择选手参加比赛
+     */
+    @Override
+    public void playerJoinProject(ProvinceCompeteDto.JoinProject param) {
+        //查找项目信息
+        CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId());
+        if(ObjectUtil.isNull(competeProject)){ throw new BaseException(CodeEnum.PARAM_ERROR); }
+        //检查参赛人数是否符合
+        if(CollectionUtil.isEmpty(param.getPlayerId())){ throw new BaseException(CodeEnum.PARAM_ERROR); }
+        if(param.getPlayerId().size() < competeProject.getMemberMin() || param.getPlayerId().size() > competeProject.getMemberMax()){
+            throw new BaseException(CodeEnum.TEAM_MEMBER_ERROR);
+        }
+        //判断项目是个人还是团队
+        if(competeProject.getTeam() == 0){
+            param.getPlayerId().forEach(playerId -> {
+                CompetePlayer player = competePlayerDao.selectByPrimaryKey(playerId);
+                if(ObjectUtil.isNull(player)){ throw new BaseException(CodeEnum.PARAM_ERROR); }
+                //查找此公司此组别是否参加过这个项目
+                int num = competeCompanyDao.getNumByCompanyAndGroup(competeProject.getId(),player.getCompanyId(),player.getCompeteGroupId(),param.getCompeteTimeId());
+                if(num > 0){
+                    throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg("该项目该组别"));
+                }
+                //查找个人参赛数量是否符合
+                CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample();
+                projectPlayerExample.createCriteria().andPlayerIdEqualTo(playerId).andCompeteTimeIdEqualTo(param.getCompeteTimeId());
+                if(projectPlayerMapper.countByExample(projectPlayerExample) >= 3){
+                    throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg(player.getName()));
+                }
+                //参加比赛记录
+                CompeteProjectPlayer projectPlayer = new CompeteProjectPlayer();
+                projectPlayer.setId(snowflake.nextId());
+                projectPlayer.setCompeteTimeId(param.getCompeteTimeId());
+                projectPlayer.setProjectId(param.getProjectId());
+                projectPlayer.setPlayerId(playerId);
+                projectPlayer.setCompeteGroupId(player.getCompeteGroupId());
+                projectPlayer.setGenderGroup(player.getGender());
+                projectPlayerMapper.insertSelective(projectPlayer);
+            });
+        }else {
+            //查找当前公司是否已经报名次项目
+            CompeteTeamExample teamExample = new CompeteTeamExample();
+            teamExample.createCriteria().andProjectIdEqualTo(competeProject.getId()).andCompanyIdEqualTo(param.getCompanyId()).andCompeteTimeIdEqualTo(param.getCompeteTimeId());
+            if(competeTeamDao.countByExample(teamExample) > 0){
+                throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg("该项目"));
+            }
+            //生成团队
+            CompeteTeam competeTeam = new CompeteTeam();
+            competeTeam.setId(snowflake.nextId());
+            competeTeam.setCompeteTimeId(param.getCompeteTimeId());
+            competeTeam.setProjectId(param.getProjectId());
+            competeTeam.setCompanyId(param.getCompanyId());
+            //添加成员表
+            for (int i = 0; i < param.getPlayerId().size(); i++) {
+                CompetePlayer player = competePlayerDao.selectByPrimaryKey(param.getPlayerId().get(i));
+                if(ObjectUtil.isNull(player)){ throw new BaseException(CodeEnum.PARAM_ERROR); }
+                //检查该选手报名项目数量
+                int a = competeCompanyDao.getTeamNumByPlayerId(param.getCompeteTimeId(),player.getId());
+                if(a >= 6){
+                    throw new BaseException(CodeEnum.JOIN_PROJECT_NUM_FULL.mtProjectMsg(player.getName()));
+                }
+                //团队性别组根据参赛成员而定
+                if (i == 0){
+                    competeTeam.setGenderGroup(player.getGender());
+                }else {
+                    if(!competeTeam.getGenderGroup().equals(player.getGender())){
+                        competeTeam.setGenderGroup((byte) 2);
+                    }
+                }
+                //添加成员表
+                CompeteTeamMember teamMember = new CompeteTeamMember();
+                teamMember.setId(snowflake.nextId());
+                teamMember.setCompeteTeamId(competeTeam.getId());
+                teamMember.setPlayerId(player.getId());
+                teamMemberMapper.insertSelective(teamMember);
+            }
+            //添加团队表
+            competeTeamDao.insertSelective(competeTeam);
+        }
+    }
+}
+

mt/src/main/resources/application.yml

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

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

@@ -158,54 +158,52 @@
         where user_id = #{userId}
         and compete_time_id = #{competeTimeId}
     </select>
+    <select id="getJoinProjectNum" resultType="java.lang.Integer">
+        SELECT
+        a1.num + a2.num as num
+        FROM
+        (SELECT
+        count(p.id) as num
+        FROM
+        t_compete_project p
+        LEFT JOIN t_compete_project_player pp on p.id = pp.project_id
+        LEFT JOIN t_compete_player pl on pp.player_id = pl.id
+        WHERE
+        pl.company_id = #{competeTimeId}) a1,
+        (SELECT
+        count(p.id) as num
+        FROM
+        t_compete_project p
+        LEFT JOIN t_compete_team t on p.id = t.project_id
+        LEFT JOIN t_compete_team_member m on t.id = m.compete_team_id
+        LEFT JOIN t_compete_player pl on m.player_id = pl.id
+        WHERE
+        pl.company_id = #{competeTimeId})a2
+    </select>
+    <select id="getNumByCompanyAndGroup" resultType="java.lang.Integer">
+        SELECT
+        count(pp.id)
+        FROM
+        `t_compete_project_player` pp LEFT JOIN t_compete_player p on pp.player_id = p.id
+        WHERE
+        pp.project_id = #{projectId}
+        and p.company_id = #{companyId}
+        and p.compete_time_id = #{competeTimeId}
+        and p.compete_group_id = #{groupId}
+        and pp.rec_status = 0
+        and p.rec_status = 0
+    </select>
+    <select id="getTeamNumByPlayerId" resultType="java.lang.Integer">
+        SELECT
+        count(t.id)
+        FROM
+        t_compete_team t LEFT JOIN t_compete_team_member m on t.id = m.compete_team_id
+        WHERE
+        t.compete_time_id = #{competeTimeId}
+        and m.player_id = #{playerId}
+        and t.rec_status = 0
+        and m.rec_status = 0
+    </select>
+
 
-    <insert id="saveCompany" parameterType="com.ccsens.mt.bean.dto.CompeteDto$CompeteCompany">
-        insert into t_compete_company
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="companyId != null">
-                id,
-            </if>
-            <if test="companyName != null">
-                name,
-            </if>
-            <if test="contactsName != null">
-                contacts_name,
-            </if>
-            <if test="contactsPhone != null">
-                contacts_phone,
-            </if>
-            <if test="coachNum != null">
-                judgment_num,
-            </if>
-            <if test="guideNum != null">
-                leader_num,
-            </if>
-            <if test="playerNum != null">
-                join_num,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="companyId != null">
-                #{companyId,jdbcType=BIGINT},
-            </if>
-            <if test="companyName != null">
-                #{companyName,jdbcType=BIGINT},
-            </if>
-            <if test="contactsName != null">
-                #{contactsName,jdbcType=INTEGER},
-            </if>
-            <if test="contactsPhone != null">
-                #{contactsPhone,jdbcType=VARCHAR},
-            </if>
-            <if test="coachNum != null">
-                #{coachNum,jdbcType=TIMESTAMP},
-            </if>
-            <if test="guideNum != null">
-                #{guideNum,jdbcType=TIMESTAMP},
-            </if>
-            <if test="playerNum != null">
-                #{playerNum,jdbcType=TINYINT},
-            </if>
-        </trim>
-    </insert>
 </mapper>

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

@@ -14,6 +14,7 @@
     <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
     <result column="compete_group_id" jdbcType="BIGINT" property="competeGroupId" />
     <result column="success" jdbcType="TINYINT" property="success" />
+    <result column="company_id" jdbcType="BIGINT" property="companyId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -75,7 +76,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, creator, project_id, compete_time_id, gender_group, certificate, qr_code, created_at, 
-    updated_at, rec_status, compete_group_id, success
+    updated_at, rec_status, compete_group_id, success, company_id
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteTeamExample" resultMap="BaseResultMap">
     select
@@ -111,13 +112,13 @@
     insert into t_compete_team (id, creator, project_id, 
       compete_time_id, gender_group, certificate, 
       qr_code, created_at, updated_at, 
-      rec_status, compete_group_id, success
+      rec_status, compete_group_id, success, 
-      )
+      company_id)
     values (#{id,jdbcType=BIGINT}, #{creator,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, 
       #{competeTimeId,jdbcType=BIGINT}, #{genderGroup,jdbcType=TINYINT}, #{certificate,jdbcType=TINYINT}, 
       #{qrCode,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
-      #{recStatus,jdbcType=TINYINT}, #{competeGroupId,jdbcType=BIGINT}, #{success,jdbcType=TINYINT}
+      #{recStatus,jdbcType=TINYINT}, #{competeGroupId,jdbcType=BIGINT}, #{success,jdbcType=TINYINT}, 
-      )
+      #{companyId,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompeteTeam">
     insert into t_compete_team
@@ -158,6 +159,9 @@
       <if test="success != null">
         success,
       </if>
+      <if test="companyId != null">
+        company_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -196,6 +200,9 @@
       <if test="success != null">
         #{success,jdbcType=TINYINT},
       </if>
+      <if test="companyId != null">
+        #{companyId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.ccsens.mt.bean.po.CompeteTeamExample" resultType="java.lang.Long">
@@ -243,6 +250,9 @@
       <if test="record.success != null">
         success = #{record.success,jdbcType=TINYINT},
       </if>
+      <if test="record.companyId != null">
+        company_id = #{record.companyId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -261,7 +271,8 @@
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{record.recStatus,jdbcType=TINYINT},
       compete_group_id = #{record.competeGroupId,jdbcType=BIGINT},
-      success = #{record.success,jdbcType=TINYINT}
+      success = #{record.success,jdbcType=TINYINT},
+      company_id = #{record.companyId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -302,6 +313,9 @@
       <if test="success != null">
         success = #{success,jdbcType=TINYINT},
       </if>
+      <if test="companyId != null">
+        company_id = #{companyId,jdbcType=BIGINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -317,7 +331,8 @@
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},
       rec_status = #{recStatus,jdbcType=TINYINT},
       compete_group_id = #{competeGroupId,jdbcType=BIGINT},
-      success = #{success,jdbcType=TINYINT}
+      success = #{success,jdbcType=TINYINT},
+      company_id = #{companyId,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

tall/src/main/resources/application.yml

@@ -1,9 +1,5 @@
 spring:
   profiles:
-<<<<<<< HEAD
     active: test
     include: util-test,common
-=======
+
-    active: dev
-    include: util-dev,common
->>>>>>> f7d8f099ca8ad4f99f76e5616b35eb8202fecdf8

tall/src/main/resources/mapper_dao/TaskSubTimeDao.xml

@@ -188,10 +188,10 @@
         r.`name` as executorRoleName,
         d.`name` as taskName,
         d.milestone as milestone,
-        FROM_UNIXTIME(s.begin_time/1000,'%Y-%m-%d %H:%m') as beginTime,
+        FROM_UNIXTIME(s.begin_time/1000,'%m-%d %H:%m') as beginTime,
-        FROM_UNIXTIME(s.end_time/1000,'%Y-%m-%d %H:%m') as endTime,
+        FROM_UNIXTIME(s.end_time/1000,'%m-%d %H:%m') as endTime,
-        if(s.real_begin_time = 0,'' ,FROM_UNIXTIME(s.real_begin_time/1000,'%Y-%m-%d %H:%m')) as realBeginTime,
+        if(s.real_begin_time = 0,'' ,FROM_UNIXTIME(s.real_begin_time/1000,'%m-%d %H:%m')) as realBeginTime,
-        if(s.real_end_time = 0,'' ,FROM_UNIXTIME(s.real_end_time/1000,'%Y-%m-%d %H:%m')) as realEndTime,
+        if(s.real_end_time = 0,'' ,FROM_UNIXTIME(s.real_end_time/1000,'%m-%d %H:%m')) as realEndTime,
         t.commentId as commentId,
         t.userName as userName,
         t.commentValue as commentValue,
@@ -248,10 +248,10 @@
         r.`name` as executorRoleName,
         d.`name` as taskName,
         d.milestone as milestone,
-        FROM_UNIXTIME(s.begin_time/1000,'%Y-%m-%d %H:%m') as beginTime,
+        FROM_UNIXTIME(s.begin_time/1000,'%m-%d %H:%m') as beginTime,
-        FROM_UNIXTIME(s.end_time/1000,'%Y-%m-%d %H:%m') as endTime,
+        FROM_UNIXTIME(s.end_time/1000,'%m-%d %H:%m') as endTime,
-        if(s.real_begin_time = 0,'' ,FROM_UNIXTIME(s.real_begin_time/1000,'%Y-%m-%d %H:%m')) as realBeginTime,
+        if(s.real_begin_time = 0,'' ,FROM_UNIXTIME(s.real_begin_time/1000,'%m-%d %H:%m')) as realBeginTime,
-        if(s.real_end_time = 0,'' ,FROM_UNIXTIME(s.real_end_time/1000,'%Y-%m-%d %H:%m')) as realEndTime,
+        if(s.real_end_time = 0,'' ,FROM_UNIXTIME(s.real_end_time/1000,'%m-%d %H:%m')) as realEndTime,
         p.id as projectId,
         p.`name` as projectName,
         t.commentId as commentId,

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

@@ -161,9 +161,14 @@ public enum CodeEnum {
 
     DINGDING_EXCEPTION(132,"钉钉接口调用异常。",true),
     URL_ERROR(133, "请求路径转换异常", true),
+    JOIN_PROJECT_NUM_FULL(134, "可参赛次数已满", true),
 
     ;
 
+    public CodeEnum mtProjectMsg(String msg){
+        this.msg = msg+this.msg;
+        return this;
+    }
     public CodeEnum addMsg(String msg){
         this.msg = msg+"行："+this.msg;
         return this;