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/EmergencySuppliesInspectInfoMapper.xml | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml
index e8d07fb..ca32de3 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInspectInfoMapper.xml
@@ -12,8 +12,18 @@
</resultMap>
<select id="selectEmergencySuppliesInspectList" resultMap="emergencySuppliesInspectInfoPageDOResult">
- select id,`supplies_id`,`inspect_result`,`inspect_time` from emergency_supplies_inspect 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.`inspect_result`,
+ a.`inspect_time`,
+ b.`name` AS suppliesName
+ FROM
+ emergency_supplies_inspect 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="addEmergencySuppliesInspect" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInspectInfo"
@@ -52,7 +62,31 @@
</resultMap>
<select id="selectEmergencySuppliesInspectById" resultMap="emergencySuppliesInspectInfoDetailDOResult">
- select id,`supplies_id`,`inspect_result`,`inspect_time` from emergency_supplies_inspect where del_flag = 0 and id = #{id}
+ SELECT
+ a.id,
+ a.`supplies_id`,
+ a.`inspect_result`,
+ a.`inspect_time`,
+ b.`name` AS suppliesName
+ FROM
+ emergency_supplies_inspect a
+ LEFT JOIN emergency_supplies b ON a.supplies_id = b.id
+ WHERE
+ a.del_flag = 0 and a.id = #{id}
+ </select>
+
+ <select id="selectEmergencySuppliesInspectBySuppliesId" resultMap="emergencySuppliesInspectInfoDetailDOResult">
+ SELECT
+ a.id,
+ a.`supplies_id`,
+ a.`inspect_result`,
+ a.`inspect_time`,
+ b.`name` AS suppliesName
+ FROM
+ emergency_supplies_inspect 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="updateEmergencySuppliesInspect" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInspectInfo">
@@ -70,4 +104,8 @@
<update id="deleteEmergencySuppliesInspect">
update emergency_supplies_inspect set del_flag = 1 where id = #{id}
</update>
+
+ <update id="deleteBySuppliesId">
+ update emergency_supplies_inspect set del_flag = 1 where supplies_id = #{id}
+ </update>
</mapper>
--
Gitblit v1.9.2