From d5e3cdd20b05c8a1856eafb1e1d022ed9e04200b Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: Wed, 20 Sep 2023 16:05:41 +0800
Subject: [PATCH] 删除整改状态，允许自选验收时间
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerLedgerController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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 4190b28..9b7cab3 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<>();
@@ -157,7 +158,6 @@
export.setRiskPointName("-");
}
-
//风险单元类型
if ("1".equals(hcp.getRiskType())) {
export.setRiskPointType("设备设施清单");
@@ -166,10 +166,14 @@
} else if ("3".equals(hcp.getRiskType())) {
export.setRiskPointType("工艺节点清单");
}
+ // 隐患责任部门
+ export.setDangerDep(hcp.getRectifyDeptName());
//隐患名称
export.setDangerName(hcp.getDangerName());
+ //隐患描述 todo
+ export.setDangerDescription(hcp.getDangerDescription());
//隐患级别
if ("0".equals(hcp.getDangerLevel())) {
@@ -193,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())) {
@@ -348,6 +361,7 @@
} else if (("超期改").equals(rectifyStatusLedger)) {
hiddenDangerCheckPoint.setStage("5");
hiddenDangerCheckPoint.setOverdueRectify("1");
+// hiddenDangerCheckPoint.setAcceptStatus("1");
}
}
//整改部门
@@ -361,6 +375,7 @@
return getDataTable(list);
}
+
//companyId下总的数据统计
public void getDangerDataStatistics(String companyId, ModelMap mmap) {
@@ -513,7 +528,7 @@
}
/**
- * 列表页面（根据companyId） todo
+ * 列表页面（根据companyId）
*/
@GetMapping("/listByCompanyId/{companyId}")
public String listByCompanyId(@PathVariable("companyId") Long companyId, ModelMap mmap) {
--
Gitblit v1.9.2