diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java
index db7437eb..5691d04a 100644
--- a/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java
+++ b/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java
@@ -237,8 +237,8 @@ public class TableVo {
 
         }
         public int getTimeSum(){
-            if(duration != 0 && games != 0) {
-                return duration * games;
+            if(duration != 0 && getGames() != 0) {
+                return duration * getGames();
             }
             return 0;
         }
diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
index 5f767e49..05477225 100644
--- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
@@ -56,8 +56,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 @Service
 @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 public class CompeteService implements ICompeteService {
-    @Resource
-    private CompeteTeamMapper competeTeamMapper;
     @Resource
     private CompeteTimeDao competeTimeDao;
     @Resource
@@ -98,8 +96,8 @@ public class CompeteService implements ICompeteService {
     private  CompeteScoreDao competeScoreDao;
     @Resource
     private  CompeteCountScoreMapper competeCountScoreMapper;
-    @Resource
-    private CompetePlayerMapper competePlayerMapper;
+//    @Resource
+//    private CompetePlayerMapper competePlayerMapper;
     @Resource
     private CompeteJudgmentMapper competeJudgmentMapper;
     @Resource
@@ -1728,7 +1726,7 @@ public class CompeteService implements ICompeteService {
             //个人
             selScropeVo.setId(competeProject.getId());
             //个人信息
-            CompetePlayer competePlayer = competePlayerMapper.selectByPrimaryKey(competeStartOrder1.getPlayerId());
+            CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(competeStartOrder1.getPlayerId());
             CompeteGroup competeGroup = competeGroupMapper.selectByPrimaryKey(competePlayer.getCompeteGroupId());
             //组别信息
             selScropeVo.setGroupId(competeGroup.getId());
@@ -1757,7 +1755,7 @@ public class CompeteService implements ICompeteService {
 }
             * */
         }else {
-            CompeteTeam competeTeam = competeTeamMapper.selectByPrimaryKey(competeStartOrder1.getPlayerId());
+            CompeteTeam competeTeam = competeTeamDao.selectByPrimaryKey(competeStartOrder1.getPlayerId());
            if(competeProject.getJoinRule()==(byte)1){
                selScropeVo.setGroupName("不限组别");
 
@@ -1782,7 +1780,7 @@ public class CompeteService implements ICompeteService {
             StringBuilder names=new StringBuilder("");
             //姓名也完成了
             competeTeamMembers.forEach(mes->{
-                names.append(competePlayerMapper.selectByPrimaryKey(mes.getPlayerId()).getName()+"、");
+                names.append(competePlayerDao.selectByPrimaryKey(mes.getPlayerId()).getName()+"、");
             });
             String name= String.valueOf(names.substring(0,names.length()-2));
             selScropeVo.setName(name);
diff --git a/mt/src/main/java/com/ccsens/mt/util/Constant.java b/mt/src/main/java/com/ccsens/mt/util/Constant.java
index 0d0dfee5..f99ad96f 100644
--- a/mt/src/main/java/com/ccsens/mt/util/Constant.java
+++ b/mt/src/main/java/com/ccsens/mt/util/Constant.java
@@ -60,7 +60,10 @@ public class Constant {
      * 每个比赛项目留给选手上传视频的时间(暂定一个小时，可以修改)
      */
     public static final long UPLOAD_VIDEO_TIME = 60 * 60 * 1000;
-
+    /**
+     * 比赛之前多上时间可以上传视频，（常量表内的key）
+     */
+    public static final String PROJECT_BEFORE_TIME_KEY = "project_before_time";
 
     public final static class Compete{
         public final static byte PROJECT_JOIN_RULE_GROUP_LIMIT = 0;
diff --git a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml
index 5cd8e03f..214ff88b 100644
--- a/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompetePlayerDao.xml
@@ -36,7 +36,7 @@
         <collection property="companyNameList" ofType="com.ccsens.mt.bean.vo.CompeteExcelVo$TeamOrderPlayerList">
             <id column="companyId" property="teamId"/>
             <result column="companyName" property="companyName"/>
-            <result column="playerName" property="playerNames"/>
+            <result column="playerName" property="playerName"/>
         </collection>
     </resultMap>
 
@@ -330,57 +330,62 @@
     </select>
     <select id="getJoinNumByType" resultMap="teamNum1">
         SELECT
-        p.id as projectId,
-        p.`name` as projectName,
-        p.certificate as certificate,
-        a.groupId as groupId,
-        a.aNum as aNum,
-        p.team as team,
-        p.join_rule as joinRule
-        FROM
-        t_compete_project p
-        LEFT JOIN(
-            SELECT
             g.id as groupId,
-            g.group_name as groupName,
-            g.sequence as sequence,
-            t.projectId,
-            if(t.num is null,'/',t.num) as aNum
+            g.group_name,
+            g.projectId,
+            g.`projectName`,
+            g.`certificate`,
+            g.`team`,
+            g.`joinRule`,
+            if(count(t.ppId) = 0,'/',count(t.ppId)) as aNum
             FROM
-            t_compete_group g
-            LEFT JOIN
             (
-                SELECT
-                g.id as gid,
-                g.group_name,
-                count(pp.id) as num,
-                pp.project_id as projectId
-                FROM
-                t_compete_group g
-                LEFT JOIN t_compete_player p on p.compete_group_id = g.id
-                LEFT JOIN t_compete_project_player pp on pp.player_id = p.id
-                LEFT JOIN t_compete_company c on p.company_id = c.id
-                WHERE
-                g.type = 0
-                and g.rec_status = 0
-                and pp.rec_status = 0
-                and p.rec_status = 0
-                and p.rec_status = 0
-                and c.rec_status = 0
-                GROUP BY g.id,pp.project_id
-                ORDER BY g.sequence
-            )t
-            on (t.gid = g.id or t.gid is null)
+            SELECT
+            gr.*,
+            p.id as projectId,
+            p.`name` as projectName,
+            p.certificate as certificate,
+            p.team as team,
+            p.join_rule as joinRule
+            FROM
+            t_compete_project p ,
+            t_compete_group gr
+            WHERE
+            p.type = 0
+            and gr.type = 0
+            and p.team = 0
+            and p.`level` = 2
+            and p.rec_status = 0
+            and gr.rec_status = 0
+            )g
+            left join
+            (
+                    SELECT
+                    pp.id as ppId,
+                    pp.project_id as projectId,
+                    pr.gender,
+                    pr.group_remark
+                    FROM
+                    t_compete_project_player pp
+                  LEFT JOIN t_compete_player pr on pp.player_id = pr.id
+                    LEFT JOIN t_compete_company c on pr.company_id = c.id
+                    LEFT JOIN t_compete_project p on pp.project_id = p.id
+            WHERE
+                    pp.rec_status = 0
+                    and p.type = 0
+                    and p.team = 0
+                    and p.`level` = 2
+                    and p.rec_status = 0
+                    and c.rec_status = 0
+                    and pr.rec_status = 0
+            )t on  t.gender = g.sex
+            and t.group_remark = g.group_remark
+            and t.projectId = g.projectId
             WHERE
             g.type = 0
             and g.rec_status = 0
-        )a on (p.id = a.projectId or a.projectId is null)
-        WHERE
-        p.type = #{type}
-        and p.team = 0
-        and p.`level` = 2
-        and rec_status = 0
-        ORDER BY p.id,a.sequence
+            GROUP BY g.projectId,g.id
+            ORDER BY g.projectId,g.sequence
     </select>
     <select id="getJoinTeamNumByType" resultMap="teamNum1">
         SELECT
diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
index a6d489ba..87f6d918 100644
--- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml
@@ -325,6 +325,7 @@
       and p.certificate = 0
       and p.rec_status = 0
       GROUP BY p.id
+      ORDER BY pc.start_time
     </select>
     <select id="queryStartOrderByCompany" resultMap="startOrderByCompany">
       SELECT
diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
index 82dc9fa9..f99a4211 100644
--- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
@@ -743,13 +743,8 @@
     IF
         (
         (
-<<<<<<< HEAD
         ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player where  t_compete_project_player.rec_status=0) )
         OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member where t_compete_team_member.rec_status=0 ) )
-=======
-        ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player WHERE rec_status = 0) )
-        OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member WHERE rec_status = 0) )
->>>>>>> 4adc089d09a6c4afde0f4ad70b88920c167d5e7a
         ),
         1,
         0
@@ -847,10 +842,7 @@
 
             ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player where  t_compete_project_player.rec_status=0 ) )
             OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member where  t_compete_team_member.rec_status=0  ) )
--- =======
---             ( tcp.id IN ( SELECT t_compete_project_player.player_id FROM t_compete_project_player WHERE rec_status = 0) )
---             OR ( tcp.id IN ( SELECT t_compete_team_member.player_id FROM t_compete_team_member WHERE rec_status = 0) )
--- >>>>>>> 4adc089d09a6c4afde0f4ad70b88920c167d5e7a
+
             ),
             1,
             0
@@ -916,7 +908,7 @@
     FROM
         (
     SELECT
-        CONCAT( FROM_UNIXTIME( pc.start_time / 1000, '%y-%m-%d %H:%i' ), '~', FROM_UNIXTIME( pc.end_time / 1000, '%H:%i' ) ) AS startTime,
+        CONCAT( FROM_UNIXTIME( pc.start_time / 1000, '%Y-%m-%d %H:%i' ), '~', FROM_UNIXTIME( pc.end_time / 1000, '%H:%i' ) ) AS startTime,
         p.`name` AS projectName,
         g.`group_name` AS groupName,
         CONCAT( so.compete_order, '--', so.site ) AS startOrder,
@@ -951,7 +943,7 @@
         AND pc.rec_status = 0
         AND so.rec_status = 0 UNION
     SELECT
-        CONCAT( FROM_UNIXTIME( pc.start_time / 1000, '%y-%m-%d %H:%i' ), '~', FROM_UNIXTIME( pc.end_time / 1000, '%H:%i' ) ) AS startTime,
+        CONCAT( FROM_UNIXTIME( pc.start_time / 1000, '%Y-%m-%d %H:%i' ), '~', FROM_UNIXTIME( pc.end_time / 1000, '%H:%i' ) ) AS startTime,
         p.`name` AS projectName,
         g.`group_name` AS groupName,
         CONCAT( so.compete_order, '--', so.site ) AS startOrder,