From ef1fe7f67a9d7d4c94933c0a993e2d9639620239 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 06 九月 2023 13:19:28 +0800
Subject: [PATCH] d多人核查，隐患检索部分改动
---
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
index bd2cfb0..af3543b 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -615,10 +615,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())){
@@ -678,12 +680,11 @@
}
CJDangerInfo.setDangerDesc(hiddenDanger.getDangerDescription());//隐患描述
CJDangerInfo.setDangerReason(dangerManage.getDangerReason());//隐患产生原因
- CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金
CJDangerInfo.setDangerManageDeadline(hiddenDanger.getRectifyDeadlineTime());//治理期限
if (ObjectUtils.isNotEmpty(dangerManage.getDangerState())){
CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());//隐患状态
}
- CJDangerInfo.setHazardDangerType(hiddenDanger.getHazardDangerType().toString());//隐患类型
+ CJDangerInfo.setHazardDangerType(dangerManage.getHazardDangerType().toString());// todo 隐患类型
CJDangerInfo.setDangerManagerId(dangerManage.getId());
//封装数据
CJDangerInfoLists.add(CJDangerInfo);
--
Gitblit v1.9.2