20201121v1.7

mt/src/main/java/com/ccsens/mt/api/CompeteTaskController.java

@@ -47,7 +47,7 @@ public class CompeteTaskController {
     @MustLogin
     @ApiOperation(value = "日程安排更新", notes = "zy:1、循环查找项目对应的配置信息。2、有则修改，没有则添加配置信息。" +
                                                         "3、根据配置的时间和场地生成出场顺序表。4存入出场顺序表。5、调用tall接口添加任务")
-    @RequestMapping(value = "/", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    @RequestMapping(value = "/update", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<TableVo.DailyScheduleProcess> updateCompeteConfig(
             @ApiParam @Validated @RequestBody QueryDto<ProvinceCompeteDto.UpdateCompeteProjectConfig> params, HttpServletRequest request) {
         log.info("日程安排更新：{}",params);

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

@@ -79,6 +79,10 @@ public class CompeteTaskService implements ICompeteTaskService{
             return new ArrayList<>();
         }
             param.getUpdateCompeteTaskList().forEach(projectConfig -> {
+                //判断时间和时长是否正确
+                if(projectConfig.getStartTime() == 0 || projectConfig.getEndTime() == 0 || projectConfig.getDuration() == 0){
+                    return;
+                }
                 //获取项目
                 CompeteProject project = competeProjectDao.selectByPrimaryKey(projectConfig.getProjectId());
                 if(ObjectUtil.isNotNull(project)){
@@ -132,7 +136,7 @@ public class CompeteTaskService implements ICompeteTaskService{
                         //计算场次
                         int order = (int) Math.ceil(projectPlayerList.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);
@@ -199,7 +203,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);
@@ -287,7 +291,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);
@@ -418,6 +422,8 @@ public class CompeteTaskService implements ICompeteTaskService{
             competeJudgment.setSite(siteJudgment.getSite());
             competeJudgment.setChiefJudgment((byte) judgmentInfo.getJudgmentNum());
             competeJudgmentDao.insertSelective(competeJudgment);
+
+
             //添加角色
             MemberRoleDto.SaveRole saveRole = new MemberRoleDto.SaveRole();
             saveRole.setProjectId(tallProjectId);

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

@@ -217,6 +217,7 @@
       WHERE
       p.type = #{type}
       and p.`level` = 2
+      and p.certificate = 0
       and p.rec_status = 0
       GROUP BY p.id
     </select>

tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java

@@ -26,6 +26,7 @@ import com.ccsens.util.WebConstant;
 import com.ccsens.util.cron.CronConstant;
 import com.ccsens.util.cron.NatureToDate;
 import com.ccsens.util.exception.BaseException;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -282,6 +283,9 @@ public class ProTaskDetailService implements IProTaskDetailService {
         proTaskDetailExample.setOrderByClause("begin_time");
         List<ProTaskDetail> firstTaskDetailList = taskDetailDao.selectByExample(proTaskDetailExample);
         PageInfo pageInfo = new PageInfo<>(firstTaskDetailList);
+
+
+
         if (CollectionUtil.isNotEmpty(firstTaskDetailList)) {
             int sequence = 1;
             for (ProTaskDetail firstTaskDetail : firstTaskDetailList) {