From 858d95b05d61f992d4e510a5b44d3f2a9704d29a Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期二, 28 十一月 2023 09:21:38 +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 07cd957..aec436b 100644
--- a/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml
+++ b/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml
@@ -137,7 +137,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 +149,13 @@
t.companyId,
t.level,
t.integral,
- su.real_name reporter
+ su.real_name reporter,
+ t.integral,
+ t.level
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_dict sd on sd.dict_id = t.dangerLocation
where t.id=#{id}
</select>
@@ -159,7 +163,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,
@@ -174,11 +179,15 @@
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_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 +196,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,
@@ -202,12 +212,16 @@
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_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