From f3afb09adeaf7acad0b4fc44afc8062ebbe649dd Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期五, 11 七月 2025 14:15:36 +0800
Subject: [PATCH] dev
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRectifyController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 6b8d46c..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,18 +148,27 @@
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";
}
+
/**
- * 隐患整改延期
+ * 隐患整改延期 - 保存
*/
@Log(title = "隐患上报", businessType = BusinessType.DELETE)
@PostMapping("/rectifyTimeOut")
@ResponseBody
@Transactional
- public AjaxResult rectifyTimeOut(HiddenDangerCheckPoint hdcp) {
+ public AjaxResult rectifyTimeOutSave(HiddenDangerCheckPoint hdcp) {
if(ObjectUtils.isEmpty(hdcp.getId())){
return AjaxResult.error("id不能为空");
}
@@ -172,4 +182,5 @@
return AjaxResult.success();
}
+
}
--
Gitblit v1.9.2