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

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

@@ -19,4 +19,10 @@ public interface CompeteProjectDao extends CompeteProjectMapper {
     List<TableVo.CompeteJoin> getPlayerForSingle (@Param("level") Byte level, @Param("type") Byte type);
     List<TableVo.CompeteJoin> getPlayerForTeam (@Param("level") Byte level, @Param("type") Byte type);
 
+    /**
+     * 查找项目下的参赛人数或队伍
+     * @param projectId
+     * @return
+     */
+    List<Long> queryJoinNum(@Param("projectId")Long projectId);
 }

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

@@ -80,7 +80,9 @@ public class CompeteTaskService implements ICompeteTaskService{
         }
             param.getUpdateCompeteTaskList().forEach(projectConfig -> {
                 //判断时间和时长是否正确
-                if(projectConfig.getStartTime() == 0 || projectConfig.getEndTime() == 0 || projectConfig.getDuration() == 0){
+                if(ObjectUtil.isNotNull(projectConfig.getStartTime()) || projectConfig.getStartTime() == 0
+                        || ObjectUtil.isNotNull(projectConfig.getEndTime()) || projectConfig.getEndTime() == 0 ||
+                ObjectUtil.isNotNull(projectConfig.getDuration()) || projectConfig.getDuration() == 0){
                     return;
                 }
                 //获取项目
@@ -126,12 +128,15 @@ public class CompeteTaskService implements ICompeteTaskService{
             //查找项目
             CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId());
             if (ObjectUtil.isNotNull(project)) {
+                //查询项目下的参赛人数或队伍
+//                List<Long> projectPlayerIdList = competeProjectDao.queryJoinNum(project.getId());
                 //判断是团队还是个人项目
                 if (project.getTeam() == 0) {
                     //个人项目查找所有参赛信息
                     CompeteProjectPlayerExample projectPlayerExample = new CompeteProjectPlayerExample();
                     projectPlayerExample.createCriteria().andProjectIdEqualTo(project.getId());
                     List<CompeteProjectPlayer> projectPlayerList = projectPlayerMapper.selectByExample(projectPlayerExample);
+
                     if (CollectionUtil.isNotEmpty(projectPlayerList)) {
                         //计算场次
                         int order = (int) Math.ceil(projectPlayerList.size() / projectConfig.getSiteNum());
@@ -203,7 +208,7 @@ public class CompeteTaskService implements ICompeteTaskService{
                                 competeStartOrder.setSite((byte) site);
                                 competeStartOrder.setTeam((byte) 0);
                                 competeStartOrder.setCompeteOrder((byte) competeOrder);
-//                                competeStartOrder.setTaskId(taskId);
+                                competeStartOrder.setTaskId(taskId);
                                 competeStartOrder.setStartTime(projectStartTime);
                                 competeStartOrder.setEndTime(projectStartTime + orderTime);
                                 startOrderMapper.insertSelective(competeStartOrder);
@@ -291,7 +296,7 @@ public class CompeteTaskService implements ICompeteTaskService{
                                 competeStartOrder.setSite((byte) site);
                                 competeStartOrder.setTeam((byte) 0);
                                 competeStartOrder.setCompeteOrder((byte) competeOrder);
-//                                competeStartOrder.setTaskId(taskId);
+                                competeStartOrder.setTaskId(taskId);
                                 competeStartOrder.setStartTime(projectStartTime);
                                 competeStartOrder.setEndTime(projectStartTime + orderTime);
                                 startOrderMapper.insertSelective(competeStartOrder);

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

@@ -1284,7 +1284,7 @@ public class ExcelService implements IExcelService {
                     String year = simpleDateFormat.format(date);
                     Date date1 = new Date(schedulePlanDetail.getEndTime());
                     SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("HH:mm");
-                    String year1 = simpleDateFormat.format(date);
+                    String year1 = simpleDateFormat1.format(date1);
                     String string = schedulePlanDetail.getProjectName()  + "(" + year +"-"+  year1 + ")";
                     stringBuilder.append(string+"  ");
                 }

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

@@ -61,4 +61,7 @@
     and g.rec_status = 0
     and c.rec_status = 0
   </select>
+  <select id="queryJoinNum" resultType="java.lang.Long">
+
+  </select>
 </mapper>