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/EmergencyDrillEvaluationInfoMapper.xml | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml
index 7e8a868..909dea5 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml
@@ -7,11 +7,24 @@
<resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfoPageDO"
id="emergencyDrillEvaluationInfoPageDOResult">
<id column="id" property="id" jdbcType="BIGINT"/>
- <result column="drill_plan_id" property="drillPlanId"/>
+ <result column="drill_execute_id" property="drillExecuteId"/>
</resultMap>
<select id="selectEmergencyDrillEvaluationList" resultMap="emergencyDrillEvaluationInfoPageDOResult">
- select id,`drill_plan_id` from emergency_drill_evaluation where del_flag = 0
+ SELECT
+ a.id,
+ c.drill_name AS drillName,
+ c.drill_address AS drillAddress,
+ c.drill_way AS drillWay,
+ c.drill_level AS drillLevel,
+ c.drill_plan_date AS drillPlanDate,
+ b.`drill_record_date` AS drillRecordDate
+ FROM
+ emergency_drill_evaluation a
+ LEFT JOIN emergency_drill_execute b ON a.drill_execute_id = b.id
+ LEFT JOIN emergency_drill_plan c ON b.drill_plan_id = c.id
+ WHERE
+ a.del_flag = 0
</select>
<insert id="addEmergencyDrillEvaluation" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfo"
@@ -24,12 +37,12 @@
<if test="gmtModitify != null ">gmt_moditify,</if>
<if test="createUid != null ">create_uid,</if>
<if test="updateUid != null ">update_uid,</if>
- <if test="drillPlanId != null ">drill_plan_id,</if>
+ <if test="drillExecuteId != null ">drill_execute_id,</if>
<if test="suitable != null and suitable != ''">`suitable`,</if>
<if test="sufficient != null and sufficient != ''">`sufficient`,</if>
<if test="arrival != null and arrival != ''">`arrival`,</if>
- <if test="supplies != null and purpose != ''">`supplies`,</if>
- <if test="protection != null and purpose != ''">`protection`,</if>
+ <if test="supplies != null and supplies != ''">`supplies`,</if>
+ <if test="protection != null and protection != ''">`protection`,</if>
<if test="whole != null and whole != ''">`whole`,</if>
<if test="division != null and division != ''">`division`,</if>
<if test="effect != null and effect != ''">`effect`,</if>
@@ -48,12 +61,12 @@
<if test="gmtModitify != null ">#{gmtModitify},</if>
<if test="createUid != null ">#{createUid},</if>
<if test="updateUid != null ">#{updateUid},</if>
- <if test="drillPlanId != null ">#{drillPlanId},</if>
+ <if test="drillExecuteId != null ">#{drillExecuteId},</if>
<if test="suitable != null and suitable != ''">#{suitable},</if>
<if test="sufficient != null and sufficient != ''">#{sufficient},</if>
<if test="arrival != null and arrival != ''">#{arrival},</if>
- <if test="supplies != null and purpose != ''">#{supplies},</if>
- <if test="protection != null and purpose != ''">#{protection},</if>
+ <if test="supplies != null and supplies != ''">#{supplies},</if>
+ <if test="protection != null and protection != ''">#{protection},</if>
<if test="whole != null and whole != ''">#{whole},</if>
<if test="division != null and division != ''">#{division},</if>
<if test="effect != null and effect != ''">#{effect},</if>
@@ -70,7 +83,7 @@
<resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfoDetailDO" id="emergencyDrillEvaluationInfoDetailDOResult">
<id column="id" property="id" jdbcType="BIGINT"/>
- <result column="drill_plan_id" property="drillPlanId"/>
+ <result column="drill_execute_id" property="drillExecuteId"/>
<result column="suitable" property="suitable"/>
<result column="sufficient" property="sufficient"/>
<result column="arrival" property="arrival"/>
@@ -89,7 +102,7 @@
</resultMap>
<select id="selectEmergencyDrillEvaluationById" resultMap="emergencyDrillEvaluationInfoDetailDOResult">
- select id ,`drill_plan_id`,`suitable`,`sufficient`,`arrival`,supplies ,protection ,whole ,division,
+ select id ,`drill_execute_id`,`suitable`,`sufficient`,`arrival`,supplies ,protection ,whole ,division,
effect ,report ,safety ,rescue ,evacuate ,need_modify ,question_and_improve ,modify_content
from emergency_drill_evaluation
where del_flag = 0 and id = #{id}
@@ -100,12 +113,12 @@
<trim prefix="SET" suffixOverrides=",">
<if test="gmtModitify != null ">gmt_moditify = #{gmtModitify},</if>
<if test="updateUid != null ">update_uid = #{updateUid},</if>
- <if test="drillPlanId != null ">drill_plan_id = #{drillPlanId},</if>
+ <if test="drillExecuteId != null ">drill_execute_id = #{drillExecuteId},</if>
<if test="suitable != null and suitable != ''">suitable = #{suitable},</if>
<if test="sufficient != null and sufficient != ''">sufficient = #{sufficient},</if>
<if test="arrival != null and arrival != ''">arrival = #{arrival},</if>
- <if test="supplies != null and purpose != ''">supplies = #{supplies},</if>
- <if test="protection != null and purpose != ''">protection = #{protection},</if>
+ <if test="supplies != null and supplies != ''">supplies = #{supplies},</if>
+ <if test="protection != null and protection != ''">protection = #{protection},</if>
<if test="whole != null and whole != ''">whole = #{whole},</if>
<if test="division != null and division != ''">division = #{division},</if>
<if test="effect != null and effect != ''">effect = #{effect},</if>
--
Gitblit v1.9.2