From e3fded6dd62d9606edab192c98f9aca5177e95e0 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 03 七月 2023 13:41:17 +0800
Subject: [PATCH] 上报修改完成-部分无数据测试

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

diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml
index eba3771..d7b1070 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml
@@ -152,6 +152,7 @@
         select * from prevent_risk_control_measure
         where id = #{id} and delete_status = 0
     </select>
+
     <select id="getPreventRiskControlMeasureByControlMeasureCode" resultMap="BaseResultMap">
         select * from prevent_risk_control_measure
         <where>
@@ -180,6 +181,7 @@
     <select id="listRiskControlMeasure"
             resultMap="BaseResultMap">
         select * from prevent_risk_control_measure where delete_status = 0
+        order by risk_event_id
     </select>
 
 
@@ -187,7 +189,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