From 9ce6a7ccf03d7d04d8559e49550d576be3bd37a3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期三, 03 八月 2022 18:08:58 +0800
Subject: [PATCH] 应急物资fix
---
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml
index ab81784..f2b4486 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml
@@ -12,8 +12,18 @@
</resultMap>
<select id="selectEmergencySuppliesMaintainList" resultMap="emergencySuppliesMaintainInfoPageDOResult">
- select id,`supplies_id`,`maintain_result`,`maintain_time` from emergency_supplies_maintain where del_flag = 0
- <if test="query.suppliesId != null and query.suppliesId != ''">and `supplies_id` = #{query.suppliesId}</if>
+ SELECT
+ a.id,
+ a.`supplies_id`,
+ a.`maintain_result`,
+ a.`maintain_time`,
+ b.`name` AS suppliesName
+ FROM
+ emergency_supplies_maintain a
+ LEFT JOIN emergency_supplies b ON a.supplies_id = b.id
+ WHERE
+ a.del_flag = 0
+ <if test="query.suppliesId != null and query.suppliesId != ''">and a.supplies_id = #{query.suppliesId}</if>
</select>
<insert id="addEmergencySuppliesMaintain" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainInfo"
@@ -52,7 +62,18 @@
</resultMap>
<select id="selectEmergencySuppliesMaintainById" resultMap="emergencySuppliesMaintainInfoDetailDOResult">
- select id,`supplies_id`,`maintain_result`,`maintain_time` from emergency_supplies_maintain where del_flag = 0 and id = #{id}
+
+ SELECT
+ a.id,
+ a.`supplies_id`,
+ a.`maintain_result`,
+ a.`maintain_time`,
+ b.`name` AS suppliesName
+ FROM
+ emergency_supplies_maintain a
+ LEFT JOIN emergency_supplies b ON a.supplies_id = b.id
+ WHERE
+ a.del_flag = 0 and a.id = #{id}
</select>
<update id="updateEmergencySuppliesMaintain" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainInfo">
--
Gitblit v1.9.2