From 7efc6ed86025b610cab109a2e9f83362740d8ed4 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期五, 08 十二月 2023 13:29:07 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml b/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml
index 07cd957..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>
@@ -137,7 +142,8 @@
<select id="selectInfo" resultType="com.thhy.secure.modules.biz.hiddenDanger.entity.HiddenDangerEntity">
select
t.id,
- t.dangerLocation,
+ sd.dict_name dangerLocation,
+ sd.dict_id dictId,
t.title,
t.createTime,
t.auditStatus,
@@ -148,10 +154,16 @@
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>
@@ -159,7 +171,8 @@
<select id="selectPageList" resultType="com.thhy.secure.modules.biz.hiddenDanger.entity.HiddenDangerEntity">
SELECT
t.id,
- t.dangerLocation,
+ sd.dict_name dangerLocation,
+ sd.dict_id dictId,
t.title,
t.createTime,
t.auditStatus,
@@ -170,15 +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>
@@ -187,7 +207,8 @@
<select id="selectAppList" resultType="com.thhy.secure.modules.biz.hiddenDanger.entity.HiddenDangerEntity">
SELECT
t.id,
- t.dangerLocation,
+ sd.dict_name dangerLocation,
+ sd.dict_id dictId,
t.title,
t.createTime,
t.auditStatus,
@@ -198,16 +219,23 @@
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.auditStatus,
case when t.auditStatus = 0 then t.createTime END,
--
Gitblit v1.9.3