From 5dc0fc9e8cdef4d6c084e5a6e1827a17bb6fe526 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期四, 04 八月 2022 18:12:34 +0800
Subject: [PATCH] 审批流程
---
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyPlanInfoMapper.xml | 23 +++++++++++++++++++----
1 files changed, 19 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 b2a223d..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
@@ -15,10 +15,25 @@
</resultMap>
<select id="selectEmergencyPlanList" resultMap="emergencyPlanInfoPageDOResult">
- select id,`name`,`status`,`type`,`level`,release_date,author_name 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