From 3246a2122cca77973c6131ed102afc156a150174 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期二, 19 九月 2023 16:48:41 +0800
Subject: [PATCH] 国泰双重预防数据导出功能修复与新增功能
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
index 4cf1c0b..1411f34 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java
@@ -23,6 +23,7 @@
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPointExport;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
@@ -121,7 +122,7 @@
if (!StringUtils.isEmpty(rectifyDeptIdLedger)) {
hiddenDangerCheckPoint.setRectifyDeptId(Long.valueOf(rectifyDeptIdLedger));
}
- List<HiddenDangerCheckPoint> list = hiddenDangerCheckPointService.selectHiddenDangerCheckPointList(hiddenDangerCheckPoint);
+ List<HiddenDangerCheckPoint> list = hiddenDangerCheckPointService.selectHiddenDangerCheckPointListNew(hiddenDangerCheckPoint);
List<HiddenDangerCheckPointExport> exportList = new ArrayList<>();
@@ -166,9 +167,13 @@
export.setRiskPointType("工艺节点清单");
}
// 隐患责任部门
- export.setDangerDep(hcp.getRectifyDeptName()); // todo
+ export.setDangerDep(hcp.getRectifyDeptName());
+
//隐患名称
export.setDangerName(hcp.getDangerName());
+
+ //隐患描述 todo
+ export.setDangerDescription(hcp.getDangerDescription());
//隐患级别
if ("0".equals(hcp.getDangerLevel())) {
@@ -192,6 +197,15 @@
export.setDangerSources("");
}
+ //整改完成期限
+ if(ObjectUtils.isNotEmpty(hcp.getRectifyDeadlineTime())){
+ export.setRectifyDeadlineTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", hcp.getRectifyDeadlineTime()));
+ }
+
+ //整改完成时间
+ if(ObjectUtils.isNotEmpty(hcp.getRectifyCompleteTime())){
+ export.setRectifyCompleteTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", hcp.getRectifyCompleteTime()));
+ }
//整改状态
if (!StringUtils.isEmpty(hcp.getStage())) {
--
Gitblit v1.9.2