From aa2051a2327c079105110f5424f3a44ffaa0c7bb Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 25 八月 2023 10:11:08 +0800
Subject: [PATCH] 延期整改

---
 src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml
index fc87371..53cfb7a 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml
@@ -178,9 +178,14 @@
         </where>
     </select>
 
-    <select id="listRiskControlMeasure"
-            resultMap="BaseResultMap">
+    <select id="listRiskControlMeasure" resultMap="BaseResultMap">
         select * from prevent_risk_control_measure where delete_status = 0
+        order by risk_event_id
+    </select>
+
+    <select id="getPreventRiskControlMeasureByUuid" resultMap="BaseResultMap">
+        select * from prevent_risk_control_measure
+        where delete_status = 0 and uuid = #{riskMeasureId}
     </select>
 
 
@@ -188,7 +193,7 @@
 <!--    List<PreventRiskControlMeasure> listReportMeasure();-->
     <select id="listReportMeasure" resultMap="BaseResultMap">
         select * from prevent_risk_control_measure
-        where report_switch = 0 and (update_report_data_time > report_time or report_time is null)
+        where report_switch = 0 and delete_status  = 0  and  (update_report_data_time > report_time or report_time is null)
     </select>
 
 <!--    int updateMeasureReportStatus(HandlerReportParam handlerReportParam);-->

--
Gitblit v1.9.2