From faee962a89c0b2379be11e66b6ada1e0379c9144 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期二, 19 三月 2024 15:46:00 +0800
Subject: [PATCH] 新增检索条件
---
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java | 75 +++++++++++++++++--------------------
1 files changed, 35 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
index 63b2dec..fc0d7a5 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -29,7 +29,6 @@
import org.springframework.transaction.annotation.Transactional;
import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
import java.util.*;
@Component
@@ -110,7 +109,7 @@
@Transactional
// @Scheduled(cron = "0 0/1 * * * ? ") // 分钟
// @Scheduled(cron = "0/30 * * * * ?") // 30秒
- @Scheduled(cron = "0 0/30 * * * ? ") // 分钟
+ @Scheduled(cron = "0 0/25 * * * ? ") // 分钟
public void searchReportDate(){
logger.info("【双重预防】定时检索需要上报数据...");
@@ -306,6 +305,7 @@
CJReportMeasure.setRiskMeasureId(measure.getId());
CJReportMeasure.setTroubleshootContent(measure.getCheckContent());
+
//封装数据
CJMeasureLists.add(CJReportMeasure);
//设置原始数据上报状态
@@ -323,6 +323,7 @@
//写入上报昌吉州转换表
for (PreventCJReportRiskControlMeasure CJMeasure : CJMeasureLists) {
CJMeasureService.insertMeasureList(CJMeasure);
+
logger.info("【双重预防】3.安全风险管控措施CJ：数据处理...");
}
}else {
@@ -460,7 +461,7 @@
//获取任务附属表信息
PreventRiskJobAndMeasure jobAndMeasureByJobId = preventRiskJobAndMeasureService.getJobAndMeasureByJobId(task.getJobId());
//转换检查结果
- //如果已经执行过，进入方法
+ //如果已经执行过，进入方法 todo
if (Integer.valueOf(hiddenDangerCheckById.getScheduleCheckStatus()) == 1){
List<HiddenDangerCheckPoint> hiddenDangerCheckPointList = trHiddenDangerCheckPointService.getHiddenDangerCheckPointByCheckId(task.getCheckId());
@@ -523,7 +524,7 @@
CJRecordFromTask.setTaskId(task.getCheckId());
//第二版标准新增
CJRecordFromTask.setMobileCode(task.getMobileCode().toString());
- List<PreventTaskType> typeByJobIds = taskTypeService.getInfoByJobId(jobAndMeasureByJobId.getJobId());
+ List<PreventTaskType> typeByJobIds = taskTypeService.getInfoByJobId(task.getJobId());
int typeTag = 0;
for (PreventTaskType typeByJobId : typeByJobIds) {
if (typeByJobId.getType()!= 0) {
@@ -603,10 +604,12 @@
//通过用户名，获取涉及到的各位用户的真实姓名
User createUser = new User();
createUser = trUserService.getUserByLoginName(hiddenDanger.getCreateBy());
+// createUser = trUserService.getUserByLoginName("guotai");
if(ObjectUtils.isEmpty(createUser)){
createUser = trUserService.getUserByName(hiddenDanger.getCreateBy());
}
User updateUser = trUserService.getUserByLoginName(hiddenDanger.getUpdateBy());
+// User updateUser = trUserService.getUserByLoginName("guotai");
if (ObjectUtils.isNotEmpty(hiddenDanger.getRegisterUserName())){
User registerUser = trUserService.getUserByLoginName(hiddenDanger.getRegisterUserName());
//登记人信息
@@ -614,10 +617,12 @@
CJDangerInfo.setRegistTime(hiddenDanger.getRegisterCreateTime());//登记时间
}
+ CJDangerInfo.setCost(String.valueOf(0));//初始值给0
if (ObjectUtils.isNotEmpty(hiddenDanger.getRectifyUserName())){
User rectifyUser = trUserService.getUserByLoginName(hiddenDanger.getRectifyUserName());
//整改人信息
CJDangerInfo.setLiablePerson(rectifyUser.getUserName());//整改责任人
+ CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金
}
if (ObjectUtils.isNotEmpty(hiddenDanger.getAcceptUserName())){
@@ -628,31 +633,27 @@
}
//如果排查任务正常存在，封装任务相关数据
- if (Integer.parseInt(hiddenDanger.getDangerSources()) != 2){
- HiddenDangerCheck dangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(hiddenDanger.getCheckId());
-
- PreventRiskDangerCheckLog dangerCheckLogByCheckId = preventRiskDangerCheckLogService.getByDangerCheckByCheckId(hiddenDanger.getCheckId());
- CJDangerInfo.setCheckRecordId(dangerCheckLogByCheckId.getUuid());//隐患排查任务记录uuid
- //找排查点，然后查措施
- PreventRiskCheckUnit unit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hiddenDanger.getCheckPointId());
- //查管控措施
- PreventRiskControlMeasure controlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(unit.getControlMeasureId());
- CJDangerInfo.setRiskMeasureId(controlMeasureById.getUuid());//管控措施uuid
- CJDangerInfo.setControlMeasures(controlMeasureById.getCheckContent());//控制措施 ,整改措施
- }else {
- CJDangerInfo.setCheckRecordId(null);//隐患排查任务记录uuid
- CJDangerInfo.setRiskMeasureId(null);//管控措施uuid
- }
-
-// if (dangerManage.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
-// CJDangerInfo.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
+// if (Integer.parseInt(hiddenDanger.getDangerSources()) != 2){
+// HiddenDangerCheck dangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(hiddenDanger.getCheckId());
+//
+// PreventRiskDangerCheckLog dangerCheckLogByCheckId = preventRiskDangerCheckLogService.getByDangerCheckByCheckId(hiddenDanger.getCheckId());
+// CJDangerInfo.setCheckRecordId(dangerCheckLogByCheckId.getUuid());//隐患排查任务记录uuid
+// //找排查点，然后查措施
+// PreventRiskCheckUnit unit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hiddenDanger.getCheckPointId());
+// //查管控措施
+// PreventRiskControlMeasure controlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(unit.getControlMeasureId());
+// CJDangerInfo.setRiskMeasureId(controlMeasureById.getUuid());//管控措施uuid
+// CJDangerInfo.setControlMeasures(controlMeasureById.getCheckContent());//控制措施 ,整改措施
// }else {
-// CJDangerInfo.setDeleted("0");
+// CJDangerInfo.setCheckRecordId(null);
+// CJDangerInfo.setRiskMeasureId(null);
// }
+ CJDangerInfo.setCheckRecordId(null);
+ CJDangerInfo.setRiskMeasureId(null);//默认无任务
CJDangerInfo.setDeleted("0");
CJDangerInfo.setId(dangerManage.getUuid());
CJDangerInfo.setCompanyCode(companyCode);
- CJDangerInfo.setHazardCode(dangerManage.getHazardCode());//风险分析对象编码
+ CJDangerInfo.setHazardCode(dangerManage.getHazardCode());
CJDangerInfo.setCreateBy(createUser.getUserName());
CJDangerInfo.setCreateDate(hiddenDanger.getCreateTime());
@@ -673,28 +674,22 @@
CJDangerInfo.setReportTime(null);
CJDangerInfo.setDataSource((byte) 1);
CJDangerInfo.setDangerName(hiddenDanger.getDangerName());
- CJDangerInfo.setDangerLevel(hiddenDanger.getDangerLevel());//隐患等级
- CJDangerInfo.setDangerSrc(dangerManage.getDangerSrc().toString());//隐患来源
+ CJDangerInfo.setDangerLevel(hiddenDanger.getDangerLevel());
+ CJDangerInfo.setDangerSrc(dangerManage.getDangerSrc().toString());
if (hiddenDanger.getRectifyType().equals("1")){
- CJDangerInfo.setDangerManageType("0");//隐患治理类型
+ CJDangerInfo.setDangerManageType("0");
}else {
- CJDangerInfo.setDangerManageType("1");//隐患治理类型
+ CJDangerInfo.setDangerManageType("1");
}
- CJDangerInfo.setDangerDesc(hiddenDanger.getDangerDescription());//隐患描述
- CJDangerInfo.setDangerReason(dangerManage.getDangerReason());//隐患产生原因
- CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金
- CJDangerInfo.setDangerManageDeadline(hiddenDanger.getRectifyDeadlineTime());//治理期限
+ CJDangerInfo.setDangerDesc(hiddenDanger.getDangerDescription());
+ CJDangerInfo.setDangerReason(dangerManage.getDangerReason());
+ CJDangerInfo.setDangerManageDeadline(hiddenDanger.getRectifyDeadlineTime());
if (ObjectUtils.isNotEmpty(dangerManage.getDangerState())){
- CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());//隐患状态
+ CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());
}
- if (hiddenDanger.getRectifyType().equals("1")){
- CJDangerInfo.setHazardDangerType("0");//隐患类型
- }else {
- CJDangerInfo.setHazardDangerType("1");//隐患类型
- }
-
+ CJDangerInfo.setHazardDangerType(dangerManage.getHazardDangerType().toString());
CJDangerInfo.setDangerManagerId(dangerManage.getId());
- //封装数据
+
CJDangerInfoLists.add(CJDangerInfo);
//设置原始数据上报状态
handlerReportParam.setId(dangerManage.getId());
--
Gitblit v1.9.2