From b8f0618c54d9d41d26d682efd2682a30c3347e15 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Tue, 10 Nov 2020 11:30:48 +0800
Subject: [PATCH] 20201110mtV1.3

---
 mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java | 2 ++
 mt/src/main/java/com/ccsens/mt/service/ProvinceService.java   | 2 +-
 mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml        | 2 +-
 mt/src/main/resources/mapper_dao/CompetePlayerDao.xml         | 4 +---
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java
index c715fe57..88911e1d 100644
--- a/mt/src/main/java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java
+++ b/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("性别")
diff --git a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java
index 9a8066e6..3233b232 100644
--- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java
@@ -169,7 +169,7 @@ public class ProvinceService implements IProvinceService {
             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());
diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml
index 9daf7c6a..33da3934 100644
--- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml
+++ b/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.sex = p.gender_group 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
diff --git a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml
index f9e89461..24d3a093 100644
--- a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml
+++ b/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>
\ No newline at end of file