From 9f122a41255d18f04a82d8be3b038a95c2c18d95 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 20 九月 2022 16:26:08 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInfoMapper.xml | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInfoMapper.xml
index 9b4c5c5..f9d36cf 100644
--- a/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencySuppliesInfoMapper.xml
@@ -114,6 +114,11 @@
from emergency_supplies where del_flag = 0 and id = #{id}
</select>
+ <select id="countEmergencySupplies" resultMap="emergencySuppliesInfoDetailDOResult">
+ select id,`name`,`count`,`production_date`,`use_period`,classification from emergency_supplies where del_flag = 0
+ <if test="query.classification != null and query.classification != ''">and `classification` = #{query.classification}</if>
+ </select>
+
<update id="updateEmergencySupplies" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencySuppliesInfo">
update emergency_supplies
<trim prefix="SET" suffixOverrides=",">
--
Gitblit v1.9.2