From c0d6e7b5da697bb7dff873839fd28f14a490d247 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 21 八月 2023 15:38:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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