From c4354b452cb7b09fe28a9e8ea81f455df1c68de8 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Fri, 05 Aug 2022 17:02:59 +0800
Subject: [PATCH] 流程fix
---
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml
index d850825..e0b23fb 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml
@@ -11,13 +11,29 @@
<result column="type" property="type"/>
<result column="level" property="level"/>
<result column="release_date" property="releaseDate"/>
+ <result column="author_name" property="authorName"/>
</resultMap>
<select id="selectEmergencyPlanList" resultMap="emergencyPlanInfoPageDOResult">
- select id,`name`,`status`,`type`,`level`,release_date from emergency_plan
- where del_flag = 0 and abolish_status = #{query.abolishStatus}
- <if test="query.name != null and query.name != ''">and `name` like concat('%', #{query.name}, '%')</if>
- <if test="query.type != null and query.type != ''">and `type` = #{query.type}</if>
+ SELECT
+ a.id,
+ a.`name`,
+ a.`status`,
+ a.`type`,
+ a.`level`,
+ a.release_date,
+ a.author_name,
+ b.approve_status AS approveStatus,
+ b.approve_person_id AS approvePersonId
+ FROM
+ emergency_plan a
+ LEFT JOIN emergency_work_approve b ON a.id = b.relate_id
+ AND b.relate_type = 1
+ WHERE
+ a.del_flag = 0
+ AND a.abolish_status = #{query.abolishStatus}
+ <if test="query.name != null and query.name != ''">and a.name like concat('%', #{query.name}, '%')</if>
+ <if test="query.type != null and query.type != ''">and a.type = #{query.type}</if>
</select>
<insert id="addEmergencyPlan" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyPlanInfo"
--
Gitblit v1.9.2