From a013aea101294906be4af0f5081dc6f5c2878d02 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期一, 27 十一月 2023 22:29:27 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml b/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml
index bfe90fd..39bd177 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,
@@ -152,6 +153,7 @@
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 +161,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,6 +177,7 @@
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}
@@ -183,6 +187,38 @@
order by t.createTime desc
</select>
+ <!--查询列表-->
+ <select id="selectAppList" resultType="com.thhy.secure.modules.biz.hiddenDanger.entity.HiddenDangerEntity">
+ SELECT
+ t.id,
+ sd.dict_name dangerLocation,
+ sd.dict_id dictId,
+ t.title,
+ t.createTime,
+ t.auditStatus,
+ t.isUse,
+ t.createUser,
+ t.updateUser,
+ t.updateTime,
+ t.companyId,
+ t.level,
+ t.integral,
+ 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_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>
+ ORDER BY
+ t.auditStatus,
+ case when t.auditStatus = 0 then t.createTime END,
+ case when t.auditStatus = 1 then t.createTime END desc
+ </select>
<!--根据ID删除-->
<delete id="deleteImg">
delete from t_hidden_danger_img
--
Gitblit v1.9.3