From 01709e5c45ef32e669fd07572a018dcfe6fc9fce Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: Thu, 06 Jul 2023 17:36:20 +0800
Subject: [PATCH] 临时提交-包保责任人标志
---
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
index 9b8d00c..ccfd57d 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -30,10 +30,7 @@
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
@Component
public class SearchReportDateSchedule {
@@ -42,6 +39,8 @@
public static SimpleDateFormat startFormat = new SimpleDateFormat("yyyy-MM-dd 06:30:00");
public static SimpleDateFormat endFormat = new SimpleDateFormat("yyyy-MM-dd 23:59:59");
+
+ public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@Autowired
private PreventReportConfigService preventReportConfigService;
@@ -357,6 +356,8 @@
if (jobById.getTroubleshootTypeCycleType() == 1){
CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
CJTaskFromWork.setCheckCycleUnit("小时");
+ CJTaskFromWork.setWorkStartTime("00:00:00");
+ CJTaskFromWork.setWorkEndTime("23:59:59");
}else if (jobById.getTroubleshootTypeCycleType() == 2){
CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
CJTaskFromWork.setCheckCycleUnit("天");
@@ -402,19 +403,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);
@@ -447,6 +446,7 @@
if (recordReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
//logger.info("【##】5.检索排查任务记录数据...");
+ System.out.println("【##】5.检索排查任务记录数据...");
//查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
List<PreventRiskDangerCheckLog> tasks = preventRiskDangerCheckLogService.listReportTask();
@@ -543,7 +543,10 @@
handlerReportParam.setReportTime(new Date());
handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
preventRiskDangerCheckLogService.updateTaskReportStatus(handlerReportParam);
+ int i = 1;
+// System.out.println("【##】数据封装" + 1);
}
+ System.out.println("【##】5.数据封装完成...");
// String checkStatus = null;
// if (ObjectUtils.isEmpty(task.getResult() )){
// checkStatus = "2";
@@ -677,8 +680,12 @@
CJDangerInfo.setDangerReason(dangerManage.getDangerReason());//隐患产生原因
CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金
CJDangerInfo.setDangerManageDeadline(hiddenDanger.getRectifyDeadlineTime());//治理期限
- CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());//隐患状态
- CJDangerInfo.setHazardDangerType(dangerManage.getHazardDangerType().toString());//隐患类型
+ if (ObjectUtils.isNotEmpty(dangerManage.getDangerState())){
+ CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());//隐患状态
+ }
+ if (ObjectUtils.isNotEmpty(dangerManage.getHazardDangerType())){
+ CJDangerInfo.setHazardDangerType(dangerManage.getHazardDangerType().toString());//隐患类型
+ }
CJDangerInfo.setDangerManagerId(dangerManage.getId());
//封装数据
CJDangerInfoLists.add(CJDangerInfo);
--
Gitblit v1.9.2