From 1bdd6405e8caffc058066bdd26cb6de1ea9cf7ea Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Tue, 09 Aug 2022 18:35:39 +0800
Subject: [PATCH] 8-9fix
---
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesMaintainInfoMapper.xml | 47 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 44 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..14b8645 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,8 +62,35 @@
</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>
+
+ <select id="selectEmergencySuppliesMaintainBySuppliesId" resultMap="emergencySuppliesMaintainInfoDetailDOResult">
+
+ 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.supplies_id = #{id}
+ </select>
+
<update id="updateEmergencySuppliesMaintain" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencySuppliesMaintainInfo">
update emergency_supplies_maintain
@@ -70,4 +107,8 @@
<update id="deleteEmergencySuppliesMaintain">
update emergency_supplies_maintain set del_flag = 1 where id = #{id}
</update>
+
+ <update id="deleteBySuppliesId">
+ update emergency_supplies_maintain set del_flag = 1 where supplies_id = #{id}
+ </update>
</mapper>
--
Gitblit v1.9.2