From e98eeaaa5766511fdb8e6d5e412eb1c59d1f07ce Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 24 六月 2025 10:24:43 +0800
Subject: [PATCH] 隐患来源功能外加仓吉基础数据定时上报

---
 src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRectifyController.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRectifyController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRectifyController.java
index a021ed0..0eaccea 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRectifyController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRectifyController.java
@@ -4,6 +4,7 @@
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.security.ShiroUtils;
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo;
 import com.ruoyi.doublePrevention.service.RiskService;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -147,6 +148,14 @@
     public String detailDangerRectify(@PathVariable("id") Long id, ModelMap mmap) {
         //隐患排查实体
         HiddenDangerCheckPoint hiddenDangerCheckPoint = hiddenDangerCheckPointService.selectHiddenDangerCheckPointById(Long.valueOf(id));
+        PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoById(hiddenDangerCheckPoint.getId());
+        if (ObjectUtils.isNotEmpty(dangerInfo)){
+            hiddenDangerCheckPoint.setHazardCode(dangerInfo.getHazardCode());
+            hiddenDangerCheckPoint.setDangerSrc(dangerInfo.getDangerSrc());
+            hiddenDangerCheckPoint.setDangerReason(dangerInfo.getDangerReason());
+            hiddenDangerCheckPoint.setHazardDangerType(dangerInfo.getHazardDangerType());
+            hiddenDangerCheckPoint.setDangerResult(dangerInfo.getDangerResult());
+        }
         mmap.put("hdcp", hiddenDangerCheckPoint);
         return prefix + "/detailDangerRectify";
     }

--
Gitblit v1.9.2