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/EmergencySuppliesInspectInfoMapper.xml | 26 +++++++++++++++++++++++--- 1 files changed, 23 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..e14e9c9 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,17 @@ </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> <update id="updateEmergencySuppliesInspect" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInspectInfo"> -- Gitblit v1.9.2