From 5746e59e622daa8ce62d0c29aaba9b8bd5308bcd Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期五, 27 六月 2025 12:28:46 +0800
Subject: [PATCH] 修复问题
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java | 7 +++++++
src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java
index 40d366b..748c0dc 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerExamineController.java
@@ -231,6 +231,13 @@
// throw new RuntimeException("添加隐患附属信息失败");
// }
+ //此处插入隐患附属表 20250623 改为更新
+ //HiddenDangerCheckPoint hiddenDangerCheckPointById = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hiddenDangerCheckPoint.getId());
+ int result = riskService.updateDangerInfo(hiddenDangerCheckPoint);
+ if (result< 1){
+ throw new RuntimeException("修改隐患附属信息失败");
+ }
+
HiddenDangerCheckPoint hdcp = hiddenDangerCheckPointService.getHiddenDangerCheckPointById(hiddenDangerCheckPoint.getId());
int confirmResult = confirmLogService.saveConfirmLog(hdcp);
if (confirmResult < 1){
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml
index 52d626f..ee0f370 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml
@@ -29,7 +29,7 @@
</insert>
<!-- int updateDangerInfo(PreventRiskDangerInfo dangerInfo);-->
- <update id="updateDangerInfo">
+ <update id="updateDangerInfoBak">
update prevent_risk_danger_info set
hazard_code = #{hazardCode},
@@ -48,7 +48,55 @@
where danger_check_point_id = #{dangerCheckPointId}
</update>
-<!-- int deleteDangerInfo(Long id);-->
+
+
+ <update id="updateDangerInfo">
+
+ update prevent_risk_danger_info
+ <set>
+ <if test="hazardCode != null ">
+ hazard_code = #{hazardCode},
+ </if>
+ <if test="hazardCode == null or hazardCode == '' ">
+ hazard_code = null,
+ </if>
+ <if test="dangerSrc != null and dangerSrc != ''">
+ danger_src = #{dangerSrc},
+ </if>
+ <if test="dangerDesc != null ">
+ danger_desc = #{dangerDesc},
+ </if>
+ <if test="dangerReason != null">
+ danger_reason = #{dangerReason},
+ </if>
+ <if test="hazardDangerType != null ">
+ hazard_danger_type = #{hazardDangerType},
+ </if>
+ <if test="dangerState != null">
+ danger_state = #{dangerState},
+ </if>
+ <if test="dangerResult != null ">
+ danger_result =#{dangerResult},
+ </if>
+ <if test="timeoutFlag != null">
+ timeout_flag = #{timeoutFlag},
+ </if>
+ <if test="updateReportDataTime != null">
+ update_report_data_time = #{updateReportDataTime},
+ </if>
+ <if test="reportStatus != null ">
+ report_status = #{reportStatus},
+ </if>
+ <if test="reportSwitch != null">
+ report_switch = #{reportSwitch},
+ </if>
+
+ </set>
+ where danger_check_point_id = #{dangerCheckPointId}
+ </update>
+
+
+ <!-- int deleteDangerInfo(Long id);-->
<delete id="deleteDangerInfo">
delete from prevent_risk_danger_info where danger_check_point_id = #{id}
</delete>
--
Gitblit v1.9.2