From db9d7e4ce7f5fea229bb512244c9d94cf31b6786 Mon Sep 17 00:00:00 2001
From: 换个名字嗨起来 <577530412@qq.com>
Date: Wed, 31 Jul 2024 13:21:45 +0800
Subject: [PATCH] 修改检索内容
---
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
index 2c410ea..8525d71 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -108,7 +108,7 @@
@Transactional
// @Scheduled(cron = "0 0/1 * * * ? ") // 分钟
-// @Scheduled(cron = "0/30 * * * * ?") // 30秒
+// @Scheduled(cron = "0/10 * * * * ?") // 30秒
@Scheduled(cron = "0 0/25 * * * ? ") // 分钟
public void searchReportDate(){
@@ -373,8 +373,17 @@
CJTaskFromWork.setCheckCycleUnit("年");
}
//获取用户信息
- User createUser = trUserService.getUserByLoginName(jobById.getCreateBy());
- User updateUser = trUserService.getUserByLoginName(jobById.getUpdateBy());
+ User createUser = new User();
+ User updateUser = new User();
+ createUser = trUserService.getUserByLoginName(jobById.getCreateBy());
+ if(ObjectUtils.isEmpty(createUser)){
+ createUser = trUserService.getUserByName(jobById.getCreateBy());
+ }
+
+ updateUser = trUserService.getUserByLoginName(jobById.getUpdateBy());
+ if(ObjectUtils.isEmpty(updateUser)){
+ updateUser = trUserService.getUserByName(jobById.getUpdateBy());
+ }
//封装上报昌吉州任务配置数据
CJTaskFromWork.setId(work.getJobUuid());
@@ -710,6 +719,7 @@
CJDangerInfo.setUpdateBy(updateUser.getUserName());
CJDangerInfo.setUpdateDate(hiddenDanger.getUpdateTime());
}
+ // todo 2024-07-01 需要检查
CJDangerInfo.setHazardCategory("0");
if (dangerManage.getId() <= 383){
PreventTaskType taskTypeInfo = taskTypeService.getInfoByTaskId(dangerManage.getId());
--
Gitblit v1.9.2