From b11dca5c6c4383d915571c47b10269e66c74079a Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期二, 28 十一月 2023 12:26:00 +0800
Subject: [PATCH] 20231128_qiuyh_调整积分相关
---
hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml | 22 ++++++++++++++++++----
1 files changed, 18 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 aec436b..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>
@@ -151,10 +156,13 @@
t.integral,
su.real_name reporter,
t.integral,
- t.level
+ 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>
@@ -175,10 +183,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
@@ -208,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
--
Gitblit v1.9.3