From e8a368c35fa8c6d65ca09ee023ce490bc11b2ea3 Mon Sep 17 00:00:00 2001 From: SZH <szh_hello@163.com> Date: 星期二, 09 八月 2022 16:42:11 +0800 Subject: [PATCH] 更新配置文件,解决接入网关之后的跨域问题 --- emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml index 6d51303..eecefb1 100644 --- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml +++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml @@ -17,6 +17,7 @@ <select id="selectEmergencyDrillExecuteList" resultMap="emergencyDrillExecuteInfoPageDOResult"> SELECT a.id, + a.drill_plan_id, b.drill_name as drillName, b.drill_address as drillAddress, b.drill_way as drillWay, @@ -30,6 +31,7 @@ LEFT JOIN emergency_plan c ON b.plan_id = c.id WHERE a.del_flag = 0 + <if test="query.status != null">and a.status = #{query.status}</if> </select> <insert id="addEmergencyDrillExecute" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfo" @@ -46,6 +48,7 @@ <if test="drillRecordDate != null ">drill_record_date,</if> <if test="drillPlanId != null ">drill_plan_id,</if> <if test="recordUserUid != null ">record_user_uid,</if> + <if test="recordUserName != null and recordUserName != ''">`record_user_name`,</if> <if test="processDesc != null and processDesc != ''">`process_desc`,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> @@ -59,6 +62,7 @@ <if test="drillRecordDate != null ">#{drillRecordDate},</if> <if test="drillPlanId != null ">#{drillPlanId},</if> <if test="recordUserUid != null ">#{recordUserUid},</if> + <if test="recordUserName != null and recordUserName != ''">#{recordUserName},</if> <if test="processDesc != null and processDesc != ''">#{processDesc},</if> </trim> </insert> @@ -71,6 +75,7 @@ <result column="drill_record_date" property="drillRecordDate"/> <result column="drill_plan_id" property="drillPlanId"/> <result column="record_user_uid" property="recordUserUid"/> + <result column="record_user_name" property="recordUserName"/> <result column="process_desc" property="processDesc"/> </resultMap> @@ -81,6 +86,7 @@ a.`drill_record_date`, a.`drill_plan_id`, a.`record_user_uid`, + a.record_user_name, a.process_desc, b.drill_name AS drillName FROM @@ -100,6 +106,7 @@ <if test="drillRecordDate != null ">drill_record_date=#{drillRecordDate},</if> <if test="drillPlanId != null ">drill_plan_id=#{drillPlanId},</if> <if test="recordUserUid != null ">record_user_uid=#{recordUserUid},</if> + <if test="recordUserName != null and recordUserName != ''">record_user_name = #{recordUserName},</if> <if test="processDesc != null and processDesc != ''">process_desc=#{processDesc},</if> </trim> @@ -109,4 +116,8 @@ <update id="deleteEmergencyDrillExecute"> update emergency_drill_execute set del_flag = 1 where id = #{id} </update> + + <update id="updateStatusById"> + update emergency_drill_execute set status = 1 where id = #{drillExecuteId} + </update> </mapper> -- Gitblit v1.9.2