Merge branch 'pt' of https://dd.tall.wiki/gitea/ccsens_wiki/ccsenscloud into pt

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

@@ -122,6 +122,7 @@ public class CompeteTaskService implements ICompeteTaskService{
 
         return projectConfigDao.queryProjectConfig(type.get());
     }
+
     /**
      * 修改配置时生成出场顺序
      */
@@ -203,9 +204,9 @@ public class CompeteTaskService implements ICompeteTaskService{
                             competeStartOrder.setProjectId(project.getId());
                             competeStartOrder.setPlayerId(playerIdOrTeamId);
                             competeStartOrder.setSite((byte) site);
-                            competeStartOrder.setTeam((byte) 0);
+                            competeStartOrder.setTeam(project.getTeam());
                             competeStartOrder.setCompeteOrder((byte) competeOrder);
-                            competeStartOrder.setTaskId(taskId);
+//                            competeStartOrder.setTaskId(taskId);
                             competeStartOrder.setStartTime(projectStartTime);
                             competeStartOrder.setEndTime(projectStartTime + orderTime);
                             log.info("添加场次信息：{}", competeStartOrder);
@@ -320,7 +321,7 @@ public class CompeteTaskService implements ICompeteTaskService{
 //                        //计算场次
 //                        int order = (int) Math.ceil(teamList.size() / projectConfig.getSiteNum());
 //                        //计算每个场次时间
-//                        long projectStartTime = projectConfig.getStartTime() + Constant.UPLOAD_VIDEO_TIME;
+//                        long projectStartTime = projectConfig.getStartTime();
 //                        long orderTime = 0;
 //                        if(order != 0) {
 //                            orderTime = (long) Math.floor((projectConfig.getEndTime() - projectStartTime) / order);

mt/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
-    include: common, util-dev
+    active: test
+    include: common, util-test
 

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

@@ -71,7 +71,7 @@
       LEFT JOIN t_compete_group g on p.compete_group_id = g.id
       LEFT JOIN t_compete_company c on p.company_id = c.id
       WHERE
-      pp.project_id = 2011
+      pp.project_id = #{projectId}
       and pp.rec_status = 0
       and p.rec_status = 0
       and g.rec_status = 0
@@ -86,7 +86,7 @@
       LEFT JOIN t_compete_group g on t.group_remark = g.group_remark and t.gender_group = g.sex
       LEFT JOIN t_compete_company c on t.company_id = c.id
       WHERE
-      t.project_id = 2022
+      t.project_id =  #{projectId}
       and t.rec_status = 0
       and g.rec_status = 0
       and c.rec_status = 0