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/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml |   79 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 76 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml
index e4de7ad..ee0f370 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml
@@ -29,15 +29,18 @@
     </insert>
 
 <!--    int updateDangerInfo(PreventRiskDangerInfo dangerInfo);-->
-    <update id="updateDangerInfo">
+    <update id="updateDangerInfoBak">
+
         update prevent_risk_danger_info set
             hazard_code = #{hazardCode},
+        <if test="dangerSrc != null and dangerSrc != ''">
             danger_src = #{dangerSrc},
+        </if>
             danger_desc = #{dangerDesc},
             danger_reason = #{dangerReason},
             hazard_danger_type = #{hazardDangerType},
             danger_state = #{dangerState},
-            danger_result =#{dangerResult}
+            danger_result =#{dangerResult},
             timeout_flag = #{timeoutFlag},
             update_report_data_time = #{updateReportDataTime},
             report_status = #{reportStatus},
@@ -45,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>
@@ -87,6 +138,28 @@
         where danger_check_point_id = #{dangerCheckPointId}
     </update>
 
+
+<!--    List<PreventRiskDangerInfo> listReportDanger();-->
+    <select id="listReportDanger" resultMap="BaseResultMap">
+<!--        select * from prevent_risk_danger_info-->
+<!--        where report_switch = 0 and (update_report_data_time > report_time or report_time is null) and (hazard_code !='' or hazard_code != null )-->
+        select * from prevent_risk_danger_info
+        where report_switch = 0 and (update_report_data_time > report_time or report_time is null) and (hazard_code !='' or hazard_code != null) and danger_state = 9
+    </select>
+
+<!--    PreventRiskDangerInfo updateDangerInfoReportStatus(HandlerReportParam handlerReportParam);-->
+    <select id="updateDangerInfoReportStatus">
+        update prevent_risk_danger_info set
+            report_status =  #{reportStatus},
+            report_time = #{reportTime}
+        where id = #{id}
+    </select>
+
+<!--    PreventRiskDangerInfo getByHiddenDangerId(Long id);resultType="com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo"-->
+    <select id="getByHiddenDangerId" resultMap="BaseResultMap">
+        select * from prevent_risk_danger_info
+        where danger_check_point_id = #{id}
+    </select>
 </mapper>
 
 

--
Gitblit v1.9.2