From 2f2e78aaf8c6c7f3eaeffeb45e2b9aba2d88278c Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期二, 11 七月 2023 16:54:32 +0800
Subject: [PATCH] 任务检索修改，页面全流程隐患上报已测试
---
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
index 29f4ef8..bb9958f 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -110,8 +110,7 @@
@Transactional
// @Scheduled(cron = "0 0/1 * * * ? ") // 分钟
// @Scheduled(cron = "0/30 * * * * ?") // 30秒
- @Scheduled(cron = "0 0 0/2 * * ?") // 小时
-
+ @Scheduled(cron = "0 0/30 * * * ? ") // 分钟
public void searchReportDate(){
logger.info("【双重预防】定时检索需要上报数据...");
@@ -356,11 +355,8 @@
if (jobById.getTroubleshootTypeCycleType() == 1){
CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
CJTaskFromWork.setCheckCycleUnit("小时");
- CJTaskFromWork.setWorkStartTime(jobById.getCreateTime());
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(jobById.getCreateTime());
- calendar.add(Calendar.HOUR, Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
- CJTaskFromWork.setWorkEndTime(calendar.getTime());
+ CJTaskFromWork.setWorkStartTime("00:00:00");
+ CJTaskFromWork.setWorkEndTime("23:59:59");
}else if (jobById.getTroubleshootTypeCycleType() == 2){
CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
CJTaskFromWork.setCheckCycleUnit("天");
@@ -406,19 +402,17 @@
PreventRiskControlMeasure measureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(work.getMeasureId());
CJTaskFromWork.setTroubleshootContent(measureById.getCheckContent());
CJTaskFromWork.setTaskStartTime(jobById.getStartTime());
- if (jobById.getTroubleshootTypeCycleType() == 1){
- Date date = new Date();
- CJTaskFromWork.setWorkStartTime(new Date(startFormat.format(date)));//todo 这个时间如何确定？
- CJTaskFromWork.setWorkEndTime(new Date(endFormat.format(date)));
- }
+
CJTaskFromWork.setWorkDayType("0");
List<PreventTaskType> typeByJobId = taskTypeService.getInfoByJobId(work.getJobId());
int typeTag = 0;
for (PreventTaskType taskType : typeByJobId) {
typeTag = taskType.getType();
}
+ if (typeTag !=0){
+ CJTaskFromWork.setTaskNum("1");
+ }
CJTaskFromWork.setWorkType(String.valueOf(typeTag));
- CJTaskFromWork.setTaskNum("1");
//封装数据
CJTaskFromWorkLists.add(CJTaskFromWork);
--
Gitblit v1.9.2