20201111v1.1

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

@@ -48,6 +48,10 @@ public class ProvinceCompeteVo {
         private Long groupId;
         @ApiModelProperty("组别名字")
         private String groupName;
+        @ApiModelProperty("性别组")
+        private int gender;
+        @ApiModelProperty("组别信息")
+        private int groupRemark;
         @ApiModelProperty("选手信息")
         private List<PlayerInfoByGroup> playerList;
     }

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

@@ -102,7 +102,7 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper {
      * @param type
      * @return
      */
-    List<ProvinceCompeteVo.GroupAndPlayer> getPlayerByTeamProject(@Param("projectId")Long projectId, @Param("type")Byte type);
+    List<ProvinceCompeteVo.GroupAndPlayer> getPlayerByTeamProject(@Param("companyId")Long companyId, @Param("projectId")Long projectId, @Param("type")Byte type);
     /**
      * 根据大赛id查看当前大赛所有队伍信息,以及联系人的信息
      * @param CompeteTimeId   大赛CompeteTimeId
@@ -140,4 +140,6 @@ public interface CompeteCompanyDao extends CompeteCompanyMapper {
      */
     int getTeamNumByPlayerIdAndGroup(@Param("competeTimeId")Long competeTimeId, @Param("playerId")Long playerId, @Param("projectId")Long projectId,
                                      @Param("companyId")Long companyId, @Param("gender")int gender, @Param("groupRemark")int groupRemark);
+
+    List<ProvinceCompeteVo.PlayerInfoByGroup> queryPlayersByTeamProject(@Param("companyId")Long companyId, @Param("projectId")Long projectId);
 }

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

@@ -635,8 +635,8 @@ public class ProvinceService implements IProvinceService {
                     competeTeam.setCompeteTimeId(param.getCompeteTimeId());
                     competeTeam.setProjectId(param.getProjectId());
                     competeTeam.setCompanyId(param.getCompanyId());
-                    competeTeam.setCompanyId((long) param.getGender());
-                    competeTeam.setCompanyId((long) param.getGroupRemark());
+                    competeTeam.setGenderGroup((byte) param.getGender());
+                    competeTeam.setGroupRemark((byte) param.getGroupRemark());
                     //添加团队表
                     competeTeamDao.insertSelective(competeTeam);
                 }
@@ -754,7 +754,7 @@ public class ProvinceService implements IProvinceService {
         //查找项目
         CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId());
         if(ObjectUtil.isNotNull(competeProject)){
-            groupAndPlayerList = competeCompanyDao.getPlayerByTeamProject(param.getProjectId(),competeProject.getType());
+            groupAndPlayerList = competeCompanyDao.getPlayerByTeamProject(param.getCompanyId(),param.getProjectId(),competeProject.getType());
         }
         return groupAndPlayerList;
     }
@@ -770,7 +770,11 @@ public class ProvinceService implements IProvinceService {
         if(ObjectUtil.isNotNull(competeProject) && competeProject.getTeam() == 1){
             //如果同单位不限组别
             if(competeProject.getJoinRule() == 1){
-                groupAndPlayerList = competeCompanyDao.queryPlayerByGroupId(competeProject.getType(),param.getCompanyId(),null,param.getProjectId());
+//                groupAndPlayerList = competeCompanyDao.queryPlayerByGroupId(competeProject.getType(),param.getCompanyId(),null,param.getProjectId());
+                List<ProvinceCompeteVo.PlayerInfoByGroup> playerInfoByGroupList = competeCompanyDao.queryPlayersByTeamProject(param.getCompanyId(),param.getProjectId());
+                ProvinceCompeteVo.GroupAndPlayer groupAndPlayer = new ProvinceCompeteVo.GroupAndPlayer();
+                groupAndPlayer.setGroupName("不限制组别");
+                groupAndPlayer.setPlayerList(playerInfoByGroupList);
             }
             //如果同单位限制组别
             if(competeProject.getJoinRule() == 0){

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

@@ -19,6 +19,8 @@
     <resultMap id="group_player" type="com.ccsens.mt.bean.vo.ProvinceCompeteVo$GroupAndPlayer">
         <id column="groupId" property="groupId"/>
         <result column="groupName" property="groupName"/>
+        <result column="gender" property="gender"/>
+        <result column="groupRemark" property="groupRemark"/>
         <collection property="playerList" ofType="com.ccsens.mt.bean.vo.ProvinceCompeteVo$PlayerInfoByGroup">
             <id column="playerId" property="playerId"/>
             <result column="playerName" property="playerName"/>
@@ -245,8 +247,8 @@
         LEFT JOIN t_compete_player p on m.player_id = p.id
         WHERE
             t.project_id = #{projectId}
-            and
-            g.type = #{type}
+            and t.company_id = #{companyId}
+            and g.type = #{type}
             and g.rec_status = 0
             and t.rec_status = 0
             and m.rec_status = 0
@@ -289,6 +291,8 @@
             g.group_name as groupName,
             p.id as playerId,
             p.`name` as playerName,
+            a.mRemark as groupRemark,
+            a.mGender as gender,
             if(a.tId is null,0,1) as joinProject
         FROM
 			t_compete_group g
@@ -339,5 +343,19 @@
             and t.rec_status = 0
             and m.rec_status = 0
     </select>
+    <select id="queryPlayersByTeamProject" resultType="com.ccsens.mt.bean.vo.ProvinceCompeteVo$PlayerInfoByGroup">
+        SELECT
+        p.id as playerId,
+        p.`name` as playerName
+        FROM
+        t_compete_team t 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 t.company_id = #{companyId}
+            and t.rec_status = 0
+            and m.rec_status = 0
+            and p.rec_status = 0
+    </select>
 
 </mapper>