11-9

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

@@ -1,7 +1,11 @@
 package com.ccsens.mt.api;
 
 import com.ccsens.mt.bean.dto.LevelDto;
+import com.ccsens.mt.bean.po.CompetePlayer;
 import com.ccsens.mt.bean.po.LevelUser;
+import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
+import com.ccsens.mt.bean.vo.TableVo;
+import com.ccsens.mt.persist.dao.CompetePlayerDao;
 import com.ccsens.mt.service.ILevelUpService;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.RedisUtil;
@@ -29,6 +33,8 @@ public class DebugController {
     private RedisUtil redisUtil;
     @Resource
     private ILevelUpService levelUpService;
+    @Resource
+    private CompetePlayerDao competePlayerDao;
 
     @ApiOperation(value = "/测试",notes = "")
     @ApiImplicitParams({
@@ -66,10 +72,10 @@ public class DebugController {
     @ApiOperation(value = "/测试",notes = "")
     @ApiImplicitParams({
     })
-    @RequestMapping(value="file",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
-    public JsonResponse debug(HttpServletRequest request, @RequestParam() Part files) throws Exception {
-        System.out.println(files.getSize());
-        return JsonResponse.newInstance().ok("测试");
+    @RequestMapping(value="/file",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
+    public JsonResponse debug() throws Exception {
+        List<TableVo.CompeteAllCount> competeAllCount = competePlayerDao.getTeamJoinNumByType(1L);
+        return JsonResponse.newInstance().ok(competeAllCount);
     }
 
 }

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

@@ -40,6 +40,7 @@ public class ExcelController {
         return JsonResponse.newInstance().ok(path);
     }
 
+
     @MustLogin
     @ApiOperation(value = "参赛人数统计表", notes = "")
     @RequestMapping(value = "/competeJoinCount", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})

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

@@ -30,6 +30,8 @@ public class CompeteTeam implements Serializable {
 
     private Long companyId;
 
+    private Byte groupRemark;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -136,6 +138,14 @@ public class CompeteTeam implements Serializable {
         this.companyId = companyId;
     }
 
+    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 CompeteTeam implements Serializable {
         sb.append(", competeGroupId=").append(competeGroupId);
         sb.append(", success=").append(success);
         sb.append(", companyId=").append(companyId);
+        sb.append(", groupRemark=").append(groupRemark);
         sb.append("]");
         return sb.toString();
     }

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

@@ -894,6 +894,66 @@ public class CompeteTeamExample {
             addCriterion("company_id not between", value1, value2, "companyId");
             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

@@ -213,4 +213,11 @@ public class ProvinceCompeteVo {
         @ApiModelProperty("教练证（浏览路径）")
         private String coachCertificate;
     }
+
+
+    @Data
+    public static class TeamGroupRemark{
+        private int sexGroup;
+        private String groupRemark = "123";
+    }
 }

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

@@ -1,10 +1,14 @@
 package com.ccsens.mt.bean.vo;
 
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author li
  */
@@ -30,7 +34,7 @@ public class TableVo {
         @ApiModelProperty("一寸证件照")
         private String picture;
         @ApiModelProperty("学籍证明/俱乐部证明")
-        private String StudentPromise;
+        private String studentPromise;
         @ApiModelProperty("体检证明")
         private String bodyTest;
         @ApiModelProperty("人身意外伤害保险证明")
@@ -56,40 +60,54 @@ public class TableVo {
     }
 
 
+//    @Data
+//    @ApiModel("XXX比赛报名汇总表")
+//    public static class CompeteAllCount{
+//        @ApiModelProperty("参赛项目")
+//        private String projectName;
+//        @ApiModelProperty("小学男子组")
+//        private int primaryMale;
+//        @ApiModelProperty("小学女子组")
+//        private int primaryFemale;
+//        @ApiModelProperty("小学混合组")
+//        private int primary;
+//        @ApiModelProperty("中学男子组")
+//        private int middleMale;
+//        @ApiModelProperty("中学女子组")
+//        private int middleFemale;
+//        @ApiModelProperty("中学混合组")
+//        private int middle;
+//        @ApiModelProperty("高职院校男子组")
+//        private int highMale;
+//        @ApiModelProperty("高职院校女子组")
+//        private int highFemale;
+//        @ApiModelProperty("高职院校混合组")
+//        private int high;
+//        @ApiModelProperty("本科院校男子组")
+//        private int collegeMale;
+//        @ApiModelProperty("本科院校女子组")
+//        private int collegeFemale;
+//        @ApiModelProperty("本科院校混合组")
+//        private int college;
+//        @ApiModelProperty("俱乐部男子组（14岁及以下）")
+//        private int clubMale;
+//        @ApiModelProperty("俱乐部女子组（14岁及以下）")
+//        private int clubFemale;
+//        @ApiModelProperty("俱乐部混合组（14岁及以下）")
+//        private int club;
+//    }
+
+
     @Data
     @ApiModel("XXX比赛报名汇总表")
+    @JsonIgnoreProperties(value = { "handler" })
     public static class CompeteAllCount{
+        @ApiModelProperty("参赛id")
+        private String projectId;
         @ApiModelProperty("参赛项目")
         private String projectName;
-        @ApiModelProperty("小学男子组")
-        private int primaryMale;
-        @ApiModelProperty("小学女子组")
-        private int primaryFemale;
-        @ApiModelProperty("小学混合组")
-        private int primary;
-        @ApiModelProperty("中学男子组")
-        private int middleMale;
-        @ApiModelProperty("中学女子组")
-        private int middleFemale;
-        @ApiModelProperty("中学混合组")
-        private int middle;
-        @ApiModelProperty("高职院校男子组")
-        private int highMale;
-        @ApiModelProperty("高职院校女子组")
-        private int highFemale;
-        @ApiModelProperty("高职院校混合组")
-        private int high;
-        @ApiModelProperty("本科院校男子组")
-        private int collegeMale;
-        @ApiModelProperty("本科院校女子组")
-        private int collegeFemale;
-        @ApiModelProperty("本科院校混合组")
-        private int college;
-        @ApiModelProperty("俱乐部男子组（14岁及以下）")
-        private int clubMale;
-        @ApiModelProperty("俱乐部女子组（14岁及以下）")
-        private int clubFemale;
-        @ApiModelProperty("俱乐部混合组（14岁及以下）")
-        private int club;
+        @ApiModelProperty("参赛人数 顺序：小学(女男混)→中学(女男混)→高职院校(女男混)→本科院校(女男混)→俱乐部(女男混)")
+        private List<Integer> nums = new ArrayList<>();
     }
+
 }

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

@@ -3,6 +3,7 @@ package com.ccsens.mt.persist.dao;
 import com.ccsens.mt.bean.po.CompetePlayer;
 import com.ccsens.mt.bean.vo.CompeteVo;
 import com.ccsens.mt.bean.vo.ProvinceCompeteVo;
+import com.ccsens.mt.bean.vo.TableVo;
 import com.ccsens.mt.persist.mapper.CompetePlayerMapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -61,4 +62,15 @@ public interface CompetePlayerDao extends CompetePlayerMapper {
      * @return 返回详细信息
      */
     ProvinceCompeteVo.PlayerInfo getPlayerByPlayerId(@Param("playerId")Long playerId);
+
+    /**
+     * 查找团队的性别组和组别信息备注
+     * @param teamId 团队id
+     * @return 返回性别组和备注
+     */
+    ProvinceCompeteVo.TeamGroupRemark getTeamGroupRemark(@Param("teamId")Long teamId);
+
+    List<TableVo.CompeteAllCount> getTeamJoinNumByType(@Param("timeId")Long timeId);
+
+    List<Integer> getTeamJoinNumByProjectId(@Param("projectId")Long projectId);
 }

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

@@ -1,19 +1,20 @@
 package com.ccsens.mt.service;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.ccsens.cloudutil.feign.TallFeignClient;
 import com.ccsens.mt.bean.dto.CompeteDto;
 import com.ccsens.mt.bean.po.*;
 import com.ccsens.mt.bean.vo.TableVo;
 import com.ccsens.mt.persist.dao.*;
 import com.ccsens.mt.persist.mapper.*;
+import com.ccsens.util.CodeEnum;
 import com.ccsens.util.PoiUtil;
 import com.ccsens.util.PropUtil;
 import com.ccsens.util.RedisUtil;
 import com.ccsens.util.WebConstant;
+
 import com.ccsens.util.bean.dto.QueryDto;
+import com.ccsens.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -27,6 +28,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
+
 @Slf4j
 @Service
 @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
@@ -35,12 +37,9 @@ public class ExcelService implements IExcelService {
     private CompeteCompanyDao competeCompanyDao;
     @Resource
     private CompeteTimeDao competeTimeDao;
-
     @Resource
     private CompeteCompanyMapper competeCompanyMapper;
     @Resource
-    private Snowflake snowflake;
-    @Resource
     private CompeteTeamDao competeTeamDao;
     @Resource
     private CompetePlayerDao competePlayerDao;
@@ -52,7 +51,10 @@ public class ExcelService implements IExcelService {
     private CompeteProjectPlayerMapper competeProjectPlayerMapper;
     @Resource
     private CompeteGroupMapper competeGroupMapper;
-
+    @Resource
+    private CommonFileMapper commonFileMapper;
+    @Resource
+    private IProvinceService provinceService;
     @Resource
     CompeteCoachMapper competeCoachMapper;
 
@@ -628,39 +630,43 @@ public class ExcelService implements IExcelService {
         return null;
     }
 
+//    private List<TableVo.CompeteAllCount> competeAllCountList(CompeteDto.CompeteTime params){
+//        //根据大赛查类型
+//        Long competeTimeId = params.getCompeteTimeId();
+//        CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(competeTimeId);
+//        int type = competeTime.getType();
+//        Byte level = 2;
+//        CompeteProjectExample competeProjectExample = new CompeteProjectExample();
+//        competeProjectExample.createCriteria().andTypeEqualTo((byte) type).andLevelEqualTo(level);
+//        //获取参赛项目集合
+//        List<CompeteProject> competeProjectList = competeProjectMapper.selectByExample(competeProjectExample);
+//        CompeteGroupExample competeGroupExample = new CompeteGroupExample();
+//        competeGroupExample.createCriteria().andTypeEqualTo((byte) type);
+//        //获取组别集合
+//        List<CompeteGroup> competeGroupList = competeGroupMapper.selectByExample(competeGroupExample);
+//        for (CompeteProject competeProject : competeProjectList){
+//            //若不是团队项目
+//            if (competeProject.getTeam() == 0){
+//                TableVo.CompeteAllCount competeAllCount = new TableVo.CompeteAllCount();
+//                //项目名赋值
+//                competeAllCount.setProjectName(competeProject.getName());
+//                //遍历组别集合
+//                int i = 0;
+//                for(CompeteGroup competeGroup : competeGroupList){
+//                    CompetePlayerExample competePlayerExample  = new CompetePlayerExample();
+//                    competePlayerExample.createCriteria().andCompeteGroupIdEqualTo(competeGroup.getId());
+//                    //计算每个组别人数
+//                    long count = competePlayerDao.countByExample(competePlayerExample);
+//                }
+//            }
+//        }
+//        return  null;
+//    }
+
+
     private List<TableVo.CompeteAllCount> competeAllCountList(CompeteDto.CompeteTime params){
-        //根据大赛查类型
-        Long competeTimeId = params.getCompeteTimeId();
-        CompeteTime competeTime = competeTimeDao.selectByPrimaryKey(competeTimeId);
-        int type = competeTime.getType();
-        Byte level = 2;
-        CompeteProjectExample competeProjectExample = new CompeteProjectExample();
-        competeProjectExample.createCriteria().andTypeEqualTo((byte) type).andLevelEqualTo(level);
-        //获取参赛项目集合
-        List<CompeteProject> competeProjectList = competeProjectMapper.selectByExample(competeProjectExample);
-        CompeteGroupExample competeGroupExample = new CompeteGroupExample();
-        competeGroupExample.createCriteria().andTypeEqualTo((byte) type);
-        //获取组别集合
-        List<CompeteGroup> competeGroupList = competeGroupMapper.selectByExample(competeGroupExample);
-        for (CompeteProject competeProject : competeProjectList){
-            //若不是团队项目
-            if (competeProject.getTeam() == 0){
-                TableVo.CompeteAllCount competeAllCount = new TableVo.CompeteAllCount();
-                //项目名赋值
-                competeAllCount.setProjectName(competeProject.getName());
-                //遍历组别集合
-                int i = 0;
-                for(CompeteGroup competeGroup : competeGroupList){
-                    CompetePlayerExample competePlayerExample  = new CompetePlayerExample();
-                    competePlayerExample.createCriteria().andCompeteGroupIdEqualTo(competeGroup.getId());
-                    //计算每个组别人数
-                    long count = competePlayerDao.countByExample(competePlayerExample);
-                }
-            }
-        }
-        return  null;
+        return competePlayerDao.getTeamJoinNumByType(params.getCompeteTimeId());
     }
 
-
 }
 

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

@@ -146,6 +146,12 @@ public class ProvinceService implements IProvinceService {
             if(ObjectUtil.isNull(competeGroup) || param.getGender() != competeGroup.getSex()){
                 throw new BaseException(CodeEnum.MT_NOT_GROUP);
             }
+            //获取选手年龄
+            int ageByIdCard = IdcardUtil.getAgeByIdCard(param.getIdCard());
+            //判断年龄和分组是否匹配
+            if(ageByIdCard < competeGroup.getMinAge() || ageByIdCard > competeGroup.getMaxAge()){
+                throw new BaseException(CodeEnum.MT_NOT_GROUP);
+            }
             //判断各种证件是否为空
             if(ObjectUtil.isNull(param.getIdCardFront()) && ObjectUtil.isNotNull(param.getIdCardBack())){
                 param.setIdCardFront(param.getIdCardBack());
@@ -165,6 +171,7 @@ public class ProvinceService implements IProvinceService {
             player.setStudentRecordFile(param.getStudentRecord());
             player.setHealthRecordFile(param.getHealthRecord());
             player.setInsuranceRecordFile(param.getInsuranceRecord());
+
 //            //添加身份证正面照片
 //            player.setIdCardFrontFile(uploadPhotoFile(param.getIdCardFront(),userId));
 //            //身份证反面
@@ -510,19 +517,8 @@ public class ProvinceService implements IProvinceService {
         CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId());
         if(ObjectUtil.isNull(competeProject)){ throw new BaseException(CodeEnum.PARAM_ERROR); }
 
-//        //检查参赛人数是否符合
-//        int joinCount = 0;
-//        for(ProvinceCompeteDto.JoinProjectPlayer joinProject : param.getPlayers()){
-//            if(joinProject.getJoinProject() == 1){
-//                joinCount++;
-//            }
-//        }
-////        if(joinCount > competeProject.getMemberMax() ){
-////            throw new BaseException(CodeEnum.TEAM_MEMBER_ERROR);
-////        }
         //判断项目是个人还是团队，参加
         if(competeProject.getTeam() == 0){
-//            param.getPlayers().forEach(joinPlayer -> {
             for(ProvinceCompeteDto.JoinProjectPlayer joinPlayer : param.getPlayers()){
                 //检查此用户之前是否参加此项目
                 CompeteProjectPlayerExample example = new CompeteProjectPlayerExample();
@@ -563,7 +559,6 @@ public class ProvinceService implements IProvinceService {
                     projectPlayer.setGenderGroup(player.getGender());
                     projectPlayerMapper.insertSelective(projectPlayer);
                 }
-//            });
             }
         }else {
             //查找当前公司是否已经报名此项目
@@ -631,10 +626,31 @@ public class ProvinceService implements IProvinceService {
                     teamMember.setCompeteTeamId(competeTeam.getId());
                     teamMember.setPlayerId(player.getId());
                     teamMemberMapper.insertSelective(teamMember);
-
                 }
             }
-
+            //查询团队内的成员，如果没有则删除团队
+            CompeteTeamMemberExample memberExample = new CompeteTeamMemberExample();
+            memberExample.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId());
+            if(teamMemberMapper.countByExample(memberExample) == 0){
+                competeTeam.setRecStatus((byte) 2);
+                competeTeamDao.updateByPrimaryKeySelective(competeTeam);
+            }else {
+                //修改团队的性别组和组别备注信息
+                ProvinceCompeteVo.TeamGroupRemark teamGroupRemark = competePlayerDao.getTeamGroupRemark(competeTeam.getId());
+                if (StrUtil.isNotEmpty(teamGroupRemark.getGroupRemark())) {
+                    competeTeam.setGenderGroup((byte) teamGroupRemark.getSexGroup());
+                    if (ObjectUtil.isNull(competeTeam.getGroupRemark()) || competeTeam.getGroupRemark() == 0) {
+                        String groupRemark = teamGroupRemark.getGroupRemark().substring(0, teamGroupRemark.getGroupRemark().length() - 3);
+                        Constant.COMPETE_TEAM_GROUP_REMARK remark = Constant.COMPETE_TEAM_GROUP_REMARK.phaseOf(groupRemark);
+                        if (ObjectUtil.isNotNull(remark)) {
+                            competeTeam.setGroupRemark((byte) remark.value);
+                        } else {
+                            competeTeam.setGroupRemark((byte) 0);
+                        }
+                    }
+                    competeTeamDao.updateByPrimaryKeySelective(competeTeam);
+                }
+            }
         }
     }
 

mt/src/main/java/com/ccsens/mt/util/Constant.java

@@ -1,5 +1,7 @@
 package com.ccsens.mt.util;
 
+import com.ccsens.util.WebConstant;
+
 /**
  * @description:
  * @author: whj
@@ -63,4 +65,53 @@ public class Constant {
         //团体赛按名次
         public final static byte RULE_TEAM_RANK = 5;
     }
+
+
+    public enum COMPETE_TEAM_GROUP_REMARK{
+        primary_school(1,"小学")
+        ,middle_school(2,"中学")
+        ,high_school(3,"高职院校")
+        ,university(4,"本科院校")
+        ,club(5,"俱乐部");
+        public int value;
+        public String phase;
+        COMPETE_TEAM_GROUP_REMARK(int value,String thePhase){
+            this.value = value;
+            this.phase = thePhase;
+        }
+        /**
+         * 手写的从int到enum的转换函数
+         */
+        public static Constant.COMPETE_TEAM_GROUP_REMARK valueOf(int value) {
+            switch (value) {
+                case 1: return primary_school;
+                case 2: return middle_school;
+                case 3: return high_school;
+                case 4: return university;
+                case 5: return club;
+                default: return null;
+            }
+        }
+        /**
+         * 手写的从String到enum的转换函数
+         */
+        public static Constant.COMPETE_TEAM_GROUP_REMARK phaseOf(String phase) {
+            if(phase.equalsIgnoreCase(primary_school.phase)) {
+                return primary_school;
+            }
+            if(phase.equalsIgnoreCase(middle_school.phase)) {
+                return middle_school;
+            }
+            if(phase.equalsIgnoreCase(high_school.phase)) {
+                return high_school;
+            }
+            if(phase.equalsIgnoreCase(university.phase)) {
+                return university;
+            }
+            if(phase.equalsIgnoreCase(club.phase)) {
+                return club;
+            }
+            return null;
+        }
+    }
 }

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

@@ -24,6 +24,13 @@
         </collection>
     </resultMap>
 
+    <resultMap id="teamNum" type="com.ccsens.mt.bean.vo.TableVo$CompeteAllCount">
+        <id column="projectId" property="projectId"/>
+        <result column="projectName" property="projectName"/>
+        <collection property="nums" ofType="Integer" column="projectId" select="getTeamJoinNumByProjectId">
+        </collection>
+    </resultMap>
+
     <select id="getInfo" resultType="com.ccsens.mt.bean.vo.CompeteVo$GetPlayerInfo">
           SELECT
             p.id AS playerId,
@@ -189,5 +196,74 @@
         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,
+        p.name as playerName,
+        if(AVG(p.gender)=0 or AVG(p.gender)=1, AVG(p.gender),2) as sexGroup
 
+        FROM
+        t_compete_player p
+        LEFT JOIN t_compete_team_member m on p.id = m.player_id
+        LEFT JOIN t_compete_group g on p.compete_group_id = g.id
+        WHERE
+        m.compete_team_id = #{teamId}
+        and p.rec_status = 0
+        and m.rec_status = 0
+        and g.rec_status = 0
+    </select>
+    <select id="getTeamJoinNumByType" resultMap="teamNum">
+        SELECT
+        p.id as projectId,
+        p.`name` as projectName
+        FROM
+        t_compete_project p LEFT JOIN t_compete_time t on p.type = t.type
+        WHERE
+        t.id = #{timeId}
+        and p.`level` = 2
+        and t.rec_status = 0
+        and p.rec_status = 0
+    </select>
+
+    <select id="getTeamJoinNumByProjectId"  resultType="Integer">
+        SELECT
+        if(p.team = 1,(if(t1.co is null,0,t1.co)),(if(t2.co is null,0,t2.co)))
+        from
+        t_compete_project p
+        LEFT JOIN
+        t_compete_group g on p.type = g.type
+        LEFT JOIN
+            (
+                SELECT
+                count(id) as co,
+                group_remark as re,
+                gender_group as ge,
+                project_id as tpId
+                FROM
+                t_compete_team
+                WHERE
+                rec_status = 0
+                GROUP BY group_remark,gender_group
+            )t1 on g.sequence = (t1.re*10 + t1.ge) and t1.tpId = p.id
+            LEFT JOIN
+            (
+                SELECT
+                pl.compete_group_id as groupId,
+                count(pp.id) as co
+                FROM
+                t_compete_project_player pp
+                LEFT JOIN t_compete_player pl on pp.player_id = pl.id
+                WHERE
+                pl.rec_status = 0 and pp.rec_status = 0
+                GROUP BY pl.compete_group_id
+            )t2 on g.id = t2.groupId
+        WHERE
+        p.id = #{projectId}
+        and g.rec_status in (0,1)
+        ORDER BY g.sequence
+    </select>
+>>>>>>> c32326aa81c6ae6a4ce3e0a067a7617201458f50
 </mapper>

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

@@ -41,7 +41,7 @@
     <select id="queryCompeteGroupByType" parameterType="java.util.Map" resultType="com.ccsens.mt.bean.vo.CompeteVo$CompeteGroup">
         SELECT
             id as groupId,
-            group_name as groupName,
+            concat(group_name,description) as groupName,
             description as groupDescription
         FROM
             t_compete_group

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

@@ -15,6 +15,7 @@
     <result column="compete_group_id" jdbcType="BIGINT" property="competeGroupId" />
     <result column="success" jdbcType="TINYINT" property="success" />
     <result column="company_id" jdbcType="BIGINT" property="companyId" />
+    <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, creator, project_id, compete_time_id, gender_group, certificate, qr_code, created_at, 
-    updated_at, rec_status, compete_group_id, success, company_id
+    updated_at, rec_status, compete_group_id, success, company_id, group_remark
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.mt.bean.po.CompeteTeamExample" resultMap="BaseResultMap">
     select
@@ -113,12 +114,12 @@
       compete_time_id, gender_group, certificate, 
       qr_code, created_at, updated_at, 
       rec_status, compete_group_id, success, 
-      company_id)
+      company_id, group_remark)
     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}, 
-      #{companyId,jdbcType=BIGINT})
+      #{companyId,jdbcType=BIGINT}, #{groupRemark,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.mt.bean.po.CompeteTeam">
     insert into t_compete_team
@@ -162,6 +163,9 @@
       <if test="companyId != null">
         company_id,
       </if>
+      <if test="groupRemark != null">
+        group_remark,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -203,6 +207,9 @@
       <if test="companyId != null">
         #{companyId,jdbcType=BIGINT},
       </if>
+      <if test="groupRemark != null">
+        #{groupRemark,jdbcType=TINYINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.ccsens.mt.bean.po.CompeteTeamExample" resultType="java.lang.Long">
@@ -253,6 +260,9 @@
       <if test="record.companyId != null">
         company_id = #{record.companyId,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" />
@@ -272,7 +282,8 @@
       rec_status = #{record.recStatus,jdbcType=TINYINT},
       compete_group_id = #{record.competeGroupId,jdbcType=BIGINT},
       success = #{record.success,jdbcType=TINYINT},
-      company_id = #{record.companyId,jdbcType=BIGINT}
+      company_id = #{record.companyId,jdbcType=BIGINT},
+      group_remark = #{record.groupRemark,jdbcType=TINYINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -316,6 +327,9 @@
       <if test="companyId != null">
         company_id = #{companyId,jdbcType=BIGINT},
       </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},
       compete_group_id = #{competeGroupId,jdbcType=BIGINT},
       success = #{success,jdbcType=TINYINT},
-      company_id = #{companyId,jdbcType=BIGINT}
+      company_id = #{companyId,jdbcType=BIGINT},
+      group_remark = #{groupRemark,jdbcType=TINYINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>