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/EmergencySuppliesInfoMapper.xml | 6 +++++- 1 files changed, 5 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..9b4c5c5 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,7 +109,7 @@ </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> @@ -125,6 +128,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