diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/CoscoAnnualreviewTaskMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/CoscoAnnualreviewTaskMapper.java index 34c405b..1dcb731 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/CoscoAnnualreviewTaskMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/dao/CoscoAnnualreviewTaskMapper.java @@ -86,7 +86,7 @@ public interface CoscoAnnualreviewTaskMapper { * 查询需要开启的任务信息 * @return */ - List selectNoTask(); + List selectNoTask(String taskId); /** * 查询供应商年审数量统计 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/AnnualScheduledTasksService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/AnnualScheduledTasksService.java index e577bf2..6a7f91e 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/AnnualScheduledTasksService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/AnnualScheduledTasksService.java @@ -9,4 +9,6 @@ public interface AnnualScheduledTasksService { List checkTask(); List closeTask(); + List MessageTask(String taskId); + } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/AnnualScheduledTasksServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/AnnualScheduledTasksServiceImpl.java index f31badb..8850a02 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/AnnualScheduledTasksServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/AnnualScheduledTasksServiceImpl.java @@ -48,7 +48,15 @@ public class AnnualScheduledTasksServiceImpl implements AnnualScheduledTasksServ @Scheduled(cron = "0 15 1 * * ?") @MessageLog(messageType = MessageType.MESSAGETYPE_GYSJY) public List checkTask() { - List noTasks = coscoAnnualreviewTaskMapper.selectNoTask(); + List noTasks = coscoAnnualreviewTaskMapper.selectNoTask(null); + //查询小于当前时间 未开启任务 + coscoAnnualreviewTaskMapper.updateNOTask(); + return noTasks; + } + + @Override + public List MessageTask(String taskId) { + List noTasks = coscoAnnualreviewTaskMapper.selectNoTask(taskId); //查询小于当前时间 未开启任务 coscoAnnualreviewTaskMapper.updateNOTask(); return noTasks; @@ -122,4 +130,6 @@ public class AnnualScheduledTasksServiceImpl implements AnnualScheduledTasksServ } + + } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java index e726011..c92ee37 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoAnnualreview/service/impl/CoscoAnnualreviewTaskServiceImpl.java @@ -14,6 +14,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.base.vo.SelectUserVo; import com.chinaunicom.zyhy.ebtp.supplier.base.vo.UserVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.dao.*; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.entity.*; +import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.AnnualScheduledTasksService; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.service.ICoscoAnnualreviewTaskService; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.AddTaskVo; import com.chinaunicom.zyhy.ebtp.supplier.coscoAnnualreview.vo.CoscoAnnualreviewTaskListVo; @@ -43,6 +44,8 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS @Autowired private CoscoAnnualreviewTaskMapper coscoAnnualreviewTaskMapper; @Autowired + private AnnualScheduledTasksService annualScheduledTasksService; + @Autowired private CoscoAnnualreviewScoringMapper coscoAnnualreviewScoringMapper; @Autowired private CoscoAnnualreviewTaskSupplierMapper coscoAnnualreviewTaskSupplierMapper; @@ -54,8 +57,7 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS private CoscoSupplierBaseMapper coscoSupplierBaseMapper; @Autowired private IUserService userService; - @Autowired - private CoscoAnnualreviewTemplateMapper coscoAnnualreviewTemplateMapper; + @Autowired private IOrgService orgService; @Autowired @@ -184,6 +186,9 @@ public class CoscoAnnualreviewTaskServiceImpl implements ICoscoAnnualreviewTaskS taskVo.setStatus(AnnualreviewTaskConstant.NOT_START); coscoAnnualreviewTaskMapper.insertCoscoAnnualreviewTask(taskVo); addList(taskVo); + if(taskVo.getStartTime().getTime()<=System.currentTimeMillis()){ + annualScheduledTasksService.MessageTask(taskVo.getId()); + } return 1; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskMapper.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskMapper.java index 9bf64d1..8c6eb5d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskMapper.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/dao/CoscoEvaluateTaskMapper.java @@ -88,7 +88,7 @@ public interface CoscoEvaluateTaskMapper { * 查询没有开启评价的任务 * @return */ - List selectNoTask(); + List selectNoTask(String taskId); /** * 查询评价任务信息 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ScheduledTasksService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ScheduledTasksService.java index ac93b02..148d842 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ScheduledTasksService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/ScheduledTasksService.java @@ -6,5 +6,7 @@ import java.util.List; public interface ScheduledTasksService { List checkTask(); + + List MessageTask(String taskId); void closeTask(); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java index d2fa8ea..4923935 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/CoscoEvaluateTaskServiceImpl.java @@ -23,6 +23,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.entity.*; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskAssignDeptService; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTaskService; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ICoscoEvaluateTemplateIndicatorNdService; +import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.service.ScheduledTasksService; import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.*; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper; import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase; @@ -72,6 +73,8 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { private ICoscoEvaluateTaskAssignDeptService coscoEvaluateTaskAssignDeptService; @Autowired private ICoscoCategoryService coscoCategoryService; + @Autowired + private ScheduledTasksService scheduledTasksService; /** * 查询【供应商评价_评价任务主表】 @@ -542,6 +545,9 @@ public class CoscoEvaluateTaskServiceImpl implements ICoscoEvaluateTaskService { if (addCoscoEvaluateTaskVo.getTaskStatus() != null) { coscoEvaluateTaskAssignDeptService.insertAssignDept(addCoscoEvaluateTaskVo); } + if(addCoscoEvaluateTaskVo.getStartTime().getTime()<=System.currentTimeMillis()){ + scheduledTasksService.MessageTask(addCoscoEvaluateTaskVo.getId()); + } } private void addCoscoEvaluateTaskVo(AddCoscoEvaluateTaskVo addCoscoEvaluateTaskVo) { diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java index 5a89760..649ae3d 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoEvaluate/service/impl/ScheduledTasksServiceImpl.java @@ -55,7 +55,18 @@ public class ScheduledTasksServiceImpl implements ScheduledTasksService { @MessageLog(messageType = MessageType.MESSAGETYPE_GYSJY) public List checkTask() { //查询小于当前时间 未开启任务 - List noTasks = coscoEvaluateTaskMapper.selectNoTask(); + List noTasks = coscoEvaluateTaskMapper.selectNoTask(null); + List ids = noTasks.stream().map(NoTaskVo::getTaskId).collect(Collectors.toList()); + //修改任务信息 + coscoEvaluateTaskMapper.updateNOTask(ids); + return noTasks; + } + + + @MessageLog(messageType = MessageType.MESSAGETYPE_GYSJY) + public List MessageTask(String taskId) { + //查询小于当前时间 未开启任务 + List noTasks = coscoEvaluateTaskMapper.selectNoTask(taskId); List ids = noTasks.stream().map(NoTaskVo::getTaskId).collect(Collectors.toList()); //修改任务信息 coscoEvaluateTaskMapper.updateNOTask(ids); diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml index 04a727b..311a448 100644 --- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml +++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoAnnualreview/dao/mapper/CoscoAnnualreviewTaskMapper.xml @@ -303,6 +303,8 @@ join cosco_supplier_base csb on csb.id = catsu.supplier_id where cat.status = 0 and cat.start_time <= now() + and csb.id = #{taskId} +