From d018082465bdb6bdbb956cfd4d80d67ba39232f6 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 03 八月 2022 17:21:24 +0800
Subject: [PATCH] 应急评价fix
---
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillEvaluationInfoMapper.xml | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 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 d78229e..bf104aa 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
@@ -11,20 +11,23 @@
</resultMap>
<select id="selectEmergencyDrillEvaluationList" resultMap="emergencyDrillEvaluationInfoPageDOResult">
- 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
+ a.id,
+ a.drill_execute_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,
+ d.`name` AS emergencyPlanName
+ 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
+ LEFT JOIN emergency_plan d ON c.plan_id = d.id
+ WHERE
+ a.del_flag = 0
</select>
<insert id="addEmergencyDrillEvaluation" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfo"
@@ -122,11 +125,13 @@
a.modify_content,
b.drill_record_date AS drillRecordDate,
b.record_user_uid AS recordUserUid,
+ b.record_user_name AS recordUserName,
b.process_desc AS processDesc,
b.drill_plan_id AS drillPlanId,
c.making_plan_date AS makingPlanDate,
c.drill_plan_date AS drillPlanDate,
c.making_user_uid AS makingUserUid,
+ c.making_user_name AS makingUserName,
c.making_department_id AS makingDepartmentId,
c.department_id AS departmentId,
c.drill_expense AS drillExpense,
@@ -136,14 +141,16 @@
c.drill_way AS drillWay,
c.insurance_measures AS insuranceMeasures,
c.remark AS remark,
- c.purpose AS purpose
+ c.purpose AS purpose,
+ d.`name` AS emergencyPlanName
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
+ LEFT JOIN emergency_plan d ON c.plan_id = d.id
WHERE
a.del_flag = 0
- AND a.id = #{id}
+ AND a.id = #{id}
</select>
<update id="updateEmergencyDrillEvaluation" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillEvaluationInfo">
--
Gitblit v1.9.2