From 3b86a023eb48becf39d5723b0ce931006b894dc0 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期二, 22 八月 2023 10:54:08 +0800
Subject: [PATCH] 隐患部门调整位置
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java
index e376eca..96eab59 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java
@@ -276,7 +276,6 @@
hdcp.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);//核查状态(待核查)
}
}
- //2.全流程隐患提交信息封装-未操作
//隐患核查
@@ -292,7 +291,6 @@
}
}
- //3.全流程隐患核查信息封装-未操作
//隐患整改
// hdcp.setRectifyCreateTime(DateUtils.getNowDate());//设置整改时间
@@ -340,11 +338,6 @@
-
-
-
-
-
/**
* 修改隐患上报
*/
@@ -354,11 +347,13 @@
// todo-2022 修改前查询
PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoById(hdcp.getId());
- hdcp.setHazardCode(dangerInfo.getHazardCode());
- hdcp.setDangerSrc(dangerInfo.getDangerSrc());
- hdcp.setDangerReason(dangerInfo.getDangerReason());
- hdcp.setHazardDangerType(dangerInfo.getHazardDangerType());
- hdcp.setDangerResult(dangerInfo.getDangerResult());
+ if (ObjectUtils.isNotEmpty(dangerInfo)){
+ hdcp.setHazardCode(dangerInfo.getHazardCode());
+ hdcp.setDangerSrc(dangerInfo.getDangerSrc());
+ hdcp.setDangerReason(dangerInfo.getDangerReason());
+ hdcp.setHazardDangerType(dangerInfo.getHazardDangerType());
+ hdcp.setDangerResult(dangerInfo.getDangerResult());
+ }
mmap.put("hiddenDangerCheckPoint", hdcp);
--
Gitblit v1.9.2