From e6ab9c2b7af85ac676ef9fbe616327eb20f04139 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: Mon, 11 Dec 2023 10:01:18 +0800
Subject: [PATCH] 暂时提交
---
src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml
index eba3771..195b09e 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml
@@ -25,6 +25,8 @@
<result column="update_report_data_time" property="updateReportDataTime"/>
<result column="report_switch" property="reportSwitch"/>
<result column="check_content" property="checkContent"/>
+ <result column="work_type" property="workType"/>
+ <result column="task_num" property="taskNum"/>
</resultMap>
<insert id="savePreventRiskControlMeasure" parameterType="com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure">
@@ -51,6 +53,8 @@
<if test="updateReportDataTime != null ">update_report_data_time,</if>
<if test="reportSwitch != null ">report_switch,</if>
<if test="checkContent != null ">check_content,</if>
+ <if test="workType != null and workType != ''">work_type,</if>
+ <if test="taskNum != null and taskNum != ''">task_num,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="uuid != null ">#{uuid},</if>
@@ -74,6 +78,8 @@
<if test="updateReportDataTime != null ">#{updateReportDataTime},</if>
<if test="reportSwitch != null ">#{reportSwitch},</if>
<if test="checkContent != null ">#{checkContent},</if>
+ <if test="workType != null and workType != ''">#{work_type},</if>
+ <if test="taskNum != null and taskNum != ''">#{task_num},</if>
</trim>
</insert>
@@ -126,6 +132,12 @@
<if test="checkContent != null">
check_content = #{checkContent},
</if>
+ <if test="workType != null and workType != ''">
+ work_type = #{workType},
+ </if>
+ <if test="taskNum != null and taskNum != ''">
+ task_num = #{taskNum},
+ </if>
</set>
where id = #{id} and delete_status = 0
</update>
@@ -152,6 +164,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>
@@ -177,9 +190,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>
@@ -187,7 +205,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