From 2595c1008bfe2d0d5e01f3b6b035faa7ccb8a2b8 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Fri, 19 Aug 2022 17:46:03 +0800
Subject: [PATCH] 目标考核
---
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInfoMapper.xml | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInfoMapper.xml
index c9d7844..f9d36cf 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencySuppliesInfoMapper.xml
@@ -38,6 +38,7 @@
<if test="usePeriod != null ">use_period,</if>
<if test="departmentId != null ">department_id,</if>
<if test="principalUserUid != null ">`principal_user_uid`,</if>
+ <if test="principalUserName != null and principalUserName != ''">`principal_user_name`,</if>
<if test="status != null and status != ''">status,</if>
<if test="classification != null and classification != ''">`classification`,</if>
<if test="name != null and name != ''">`name`,</if>
@@ -66,6 +67,7 @@
<if test="usePeriod != null ">#{usePeriod},</if>
<if test="departmentId != null ">#{departmentId},</if>
<if test="principalUserUid != null ">#{principalUserUid},</if>
+ <if test="principalUserName != null and principalUserName != ''">#{principalUserName},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="classification != null and classification != ''">#{classification},</if>
<if test="name != null and name != ''">#{name},</if>
@@ -92,6 +94,7 @@
<result column="use_period" property="usePeriod"/>
<result column="department_id" property="departmentId"/>
<result column="principal_user_uid" property="principalUserUid"/>
+ <result column="principal_user_name" property="principalUserName"/>
<result column="status" property="status"/>
<result column="classification" property="classification"/>
<result column="name" property="name"/>
@@ -106,9 +109,14 @@
</resultMap>
<select id="selectEmergencySuppliesById" resultMap="emergencySuppliesInfoDetailDOResult">
- select id ,`production_date`,`use_date`,`inspect_date`,`next_inspect_date`,inspect_period ,`count` ,use_period ,department_id ,principal_user_uid ,
+ select id ,`production_date`,`use_date`,`inspect_date`,`next_inspect_date`,inspect_period ,`count` ,use_period ,department_id ,principal_user_uid ,principal_user_name,
status ,classification ,`name` ,`number` ,model ,longitude ,latitude ,`use` ,area_id ,place ,use_explain
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">
@@ -125,6 +133,7 @@
<if test="usePeriod != null ">use_period = #{usePeriod},</if>
<if test="departmentId != null ">department_id = #{departmentId},</if>
<if test="principalUserUid != null ">`principal_user_uid` = #{principalUserUid},</if>
+ <if test="principalUserName != null and principalUserName != ''">principal_user_name = #{principalUserName},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="classification != null and classification != ''">`classification` = #{classification},</if>
<if test="name != null and name != ''">`name` = #{name},</if>
--
Gitblit v1.9.2