From 61a90be7178c60a838ec15ed9a24202a80cd242f Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 01 八月 2022 08:59:05 +0800
Subject: [PATCH] fix
---
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 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 38e2261..6d51303 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
@@ -15,7 +15,21 @@
</resultMap>
<select id="selectEmergencyDrillExecuteList" resultMap="emergencyDrillExecuteInfoPageDOResult">
- select id,`status`,`drill_record_date`,`drill_plan_id`,`record_user_uid`,process_desc from emergency_drill_execute where del_flag = 0
+ SELECT
+ a.id,
+ b.drill_name as drillName,
+ b.drill_address as drillAddress,
+ b.drill_way as drillWay,
+ b.drill_level as drillLevel,
+ b.drill_plan_date as drillPlanDate,
+ a.`drill_record_date`,
+ c.`name` as emergencyPlanName
+ FROM
+ emergency_drill_execute a
+ LEFT JOIN emergency_drill_plan b ON a.drill_plan_id = b.id
+ LEFT JOIN emergency_plan c ON b.plan_id = c.id
+ WHERE
+ a.del_flag = 0
</select>
<insert id="addEmergencyDrillExecute" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfo"
@@ -61,16 +75,26 @@
</resultMap>
<select id="selectEmergencyDrillExecuteById" resultMap="emergencyDrillExecuteInfoDetailDOResult">
- select id,`status`,`drill_record_date`,`drill_plan_id`,`record_user_uid`,process_desc from emergency_drill_execute
- where del_flag = 0 and id = #{id}
+ SELECT
+ a.id,
+ a.`status`,
+ a.`drill_record_date`,
+ a.`drill_plan_id`,
+ a.`record_user_uid`,
+ a.process_desc,
+ b.drill_name AS drillName
+ FROM
+ emergency_drill_execute a
+ LEFT JOIN emergency_drill_plan b ON a.drill_plan_id = b.id
+ WHERE
+ a.del_flag = 0
+ AND a.id = #{id}
</select>
<update id="updateEmergencyDrillExecute" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfo">
update emergency_drill_execute
<trim prefix="SET" suffixOverrides=",">
- <if test="gmtCreate != null ">gmt_create = #{gmtCreate},</if>
<if test="gmtModitify != null ">gmt_moditify = #{gmtModitify},</if>
- <if test="createUid != null ">create_uid = #{createUid},</if>
<if test="updateUid != null ">update_uid = #{updateUid},</if>
<if test="status != null ">status = #{status},</if>
<if test="drillRecordDate != null ">drill_record_date=#{drillRecordDate},</if>
--
Gitblit v1.9.2