From 7806f1910522ac9ab1eaebd26ab973afec54850c Mon Sep 17 00:00:00 2001 From: 邱宇豪 <qyh123230312> Date: 星期四, 30 十一月 2023 09:30:38 +0800 Subject: [PATCH] 20231130_qiuyh_调整区域巡检打卡 --- hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml b/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml index 39bd177..5725ca3 100644 --- a/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml +++ b/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml @@ -89,10 +89,10 @@ <update id="update"> update t_hidden_danger <set> - <if test="dangerLocation != null"> + <if test="dangerLocation != null and dangerLocation !=''"> dangerLocation = #{dangerLocation,jdbcType=VARCHAR}, </if> - <if test="title != null"> + <if test="title != null and title !=''"> title = #{title,jdbcType=VARCHAR}, </if> <if test="createTime != null"> @@ -122,7 +122,12 @@ <if test="level != null"> `level` = #{level,jdbcType=INTEGER}, </if> - + <if test="auditUser != null"> + auditUser = #{auditUser,jdbcType=VARCHAR}, + </if> + <if test="auditTime != null"> + auditTime = #{auditTime,jdbcType=TIMESTAMP}, + </if> </set> where id=#{id,jdbcType=VARCHAR} </update> @@ -149,10 +154,15 @@ t.companyId, t.level, t.integral, - su.real_name reporter + su.real_name reporter, + t.integral, + t.level, + su2.real_name auditUser, + t.auditTime from t_hidden_danger t LEFT JOIN sys_users su ON su.user_id = t.createUser LEFT JOIN sys_users su1 ON su1.user_id = t.updateUser + LEFT JOIN sys_users su2 ON su2.user_id = t.auditUser LEFT JOIN sys_dict sd on sd.dict_id = t.dangerLocation where t.id=#{id} </select> @@ -173,16 +183,22 @@ t.companyId, t.level, t.integral, + su2.real_name auditUser, + t.auditTime, su.real_name reporter from t_hidden_danger t LEFT JOIN sys_users su ON su.user_id = t.createUser LEFT JOIN sys_users su1 ON su1.user_id = t.updateUser + LEFT JOIN sys_users su2 ON su2.user_id = t.auditUser LEFT JOIN sys_dict sd on sd.dict_id = t.dangerLocation WHERE t.isUse = 1 and t.companyId = #{companyId} <if test="startTime!= null and endTime!=null and startTime != '' and endTime !=''"> and t.createTime BETWEEN #{startTime} and #{endTime} + </if> + <if test="createUser!= null and createUser != ''"> + and t.createUser =#{createUser} </if> order by t.createTime desc </select> @@ -203,10 +219,13 @@ t.companyId, t.level, t.integral, + su2.real_name auditUser, + t.auditTime, su.real_name reporter from t_hidden_danger t LEFT JOIN sys_users su ON su.user_id = t.createUser LEFT JOIN sys_users su1 ON su1.user_id = t.updateUser + LEFT JOIN sys_users su2 ON su2.user_id = t.auditUser LEFT JOIN sys_dict sd on sd.dict_id = t.dangerLocation WHERE t.isUse = 1 @@ -214,6 +233,9 @@ <if test="startTime!= null and endTime!=null and startTime != '' and endTime !=''"> and t.createTime BETWEEN #{startTime} and #{endTime} </if> + <if test="createUser!= null and createUser != ''"> + and t.createUser =#{createUser} + </if> ORDER BY t.auditStatus, case when t.auditStatus = 0 then t.createTime END, -- Gitblit v1.9.3