From 8182bc87ec7f27cef31f07b30d089377d06b778c Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Tue, 10 Nov 2020 18:23:53 +0800
Subject: [PATCH] 20201110mtV1.6

---
 .../java/com/ccsens/mt/bean/vo/ProvinceCompeteVo.java  |  2 ++
 .../java/com/ccsens/mt/service/ProvinceService.java    |  9 ++++++++-
 mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml | 10 +++++-----
 3 files changed, 15 insertions(+), 6 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 88911e1d..450b41a3 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
@@ -81,6 +81,8 @@ public class ProvinceCompeteVo {
         private String name;
         @ApiModelProperty("是否是团队项目 0否 1是")
         private byte team;
+        @ApiModelProperty("参赛规则 0限制组别 1不限组别")
+        private byte joinRule;
         @ApiModelProperty("最少人数")
         private int memberMin;
         @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 5eaf9556..604dd8e7 100644
--- a/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/ProvinceService.java
@@ -620,6 +620,13 @@ public class ProvinceService implements IProvinceService {
         }
     }
 
+//    /**
+//     * 参加个人比赛
+//     */
+//    private void joinTiwnProject(){
+//
+//    }
+
     /**
      * 查找教练详细信息
      */
@@ -633,7 +640,7 @@ public class ProvinceService implements IProvinceService {
      */
     @Override
     public List<ProvinceCompeteVo.GroupAndPlayer> getPlayerByTeamProject(ProvinceCompeteDto.GetPlayerByTeamProject param) {
-        List<ProvinceCompeteVo.GroupAndPlayer> groupAndPlayerList = null;
+        List<ProvinceCompeteVo.GroupAndPlayer> groupAndPlayerList = new ArrayList<>();
         //查找项目
         CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId());
         if(ObjectUtil.isNotNull(competeProject)){
diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml
index 1eda459c..64153f6d 100644
--- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml
@@ -127,6 +127,7 @@
         p.id as id,
         p.`name` as `name`,
         team,
+        p.join_rule as joinRule,
         member_min as memberMin,
         member_max as memberMax,
 				if(
@@ -233,11 +234,10 @@
     </select>
     <select id="getPlayerByTeamProject" resultMap="group_player">
         SELECT
-        g.id,
-        g.group_name,
-        t.project_id,
-        p.id,
-        p.`name`
+        g.id as groupId,
+        g.group_name as groupName,
+        p.id as playerId,
+        p.`name` as playerName
         FROM
         t_compete_group g
         LEFT JOIN t_compete_team t on g.sex = t.gender_group and g.group_remark = t.group_remark