From 307ac519ae05bc70bf6d18c0f679847288928c38 Mon Sep 17 00:00:00 2001 From: 16639036659 <577530412@qq.com> Date: 星期一, 11 十二月 2023 10:05:10 +0800 Subject: [PATCH] 暂时提交 --- src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml | 109 +++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 87 insertions(+), 22 deletions(-) diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskControlMeasureMapper.xml index 8353bf5..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> @@ -82,72 +88,131 @@ update prevent_risk_control_measure <set> <if test="gmtModitify != null "> - gmt_moditify = #{gmtModitify} + gmt_moditify = #{gmtModitify}, </if> <if test="controlType != null"> - control_type = #{controlType} + control_type = #{controlType}, </if> <if test="classify1 != null"> - classify1 = #{classify1} + classify1 = #{classify1}, </if> <if test="classify2 != null"> - classify2 = #{classify2} + classify2 = #{classify2}, </if> <if test="controlMeasureCode != null"> - control_measure_code = #{controlMeasureCode} + control_measure_code = #{controlMeasureCode}, </if> <if test="measureDesc != null"> - measure_desc = #{measureDesc} + measure_desc = #{measureDesc}, </if> <if test="riskEventId != null"> - risk_event_id = #{riskEventId} + risk_event_id = #{riskEventId}, </if> <if test="riskEventUuid != null"> - risk_event_uuid = #{riskEventUuid} + risk_event_uuid = #{riskEventUuid}, </if> <if test="classify3 != null"> - classify3 = #{classify3} + classify3 = #{classify3}, </if> <if test="lastEditUserName != null"> - last_edit_user_name = #{lastEditUserName} + last_edit_user_name = #{lastEditUserName}, </if> <if test="reportTime != null"> - report_time = #{reportTime} + report_time = #{reportTime}, </if> <if test="updateReportDataTime != null"> - update_report_data_time = #{updateReportDataTime} + update_report_data_time = #{updateReportDataTime}, </if> <if test="reportStatus != null"> - report_status = #{reportStatus} + report_status = #{reportStatus}, </if> <if test="reportSwitch != null"> - report_switch = #{reportSwitch} + report_switch = #{reportSwitch}, </if> <if test="checkContent != null"> - check_content = #{checkContent} + check_content = #{checkContent}, </if> - where id = #{id} and delete_status = 0 + <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> <update id="deletePreventRiskControlMeasureById"> update prevent_risk_control_measure <set> - <if test="preventRiskControlMeasure.gmtModitify != null "> - gmt_moditify = #{preventRiskControlMeasure.gmtModitify}, + <if test="gmtModitify != null "> + gmt_moditify = #{gmtModitify}, </if> - <if test="preventRiskControlMeasure.lastEditUserName != null "> - last_edit_user_name = #{preventRiskControlMeasure.lastEditUserName}, + <if test="lastEditUserName != null "> + last_edit_user_name = #{lastEditUserName}, </if> - delete_status = 1 where id = #{id} + <if test="updateReportDataTime != null"> + update_report_data_time = #{updateReportDataTime}, + </if> + delete_status = 1 where id = #{id} and delete_status = 0 </set> </update> <select id="getPreventRiskControlMeasureById" - resultType="com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure"> + resultMap="BaseResultMap"> 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> + delete_status = 0 + <if test="controlMeasureCode != null"> + and control_measure_code = #{controlMeasureCode} + </if> + </where> + </select> + + + <select id="listRiskControlMeasureByCondition" resultMap="BaseResultMap"> + select * from prevent_risk_control_measure + <where> + delete_status = 0 + <if test="controlType != null"> + and control_type = #{controlType} + </if> + <if test="riskEventId != null"> + and risk_event_id = #{riskEventId} + </if> + order by gmt_moditify desc + </where> + </select> + + <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> + + + +<!-- List<PreventRiskControlMeasure> listReportMeasure();--> + <select id="listReportMeasure" resultMap="BaseResultMap"> + select * from prevent_risk_control_measure + 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);--> + <update id="updateMeasureReportStatus" > + update prevent_risk_control_measure set + report_status = #{reportStatus}, + report_time = #{reportTime} + where id = #{id} + </update> </mapper> -- Gitblit v1.9.2