From 2c783432245859f3ee745e4e9d8cc98dfa7c0865 Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期二, 21 十一月 2023 11:28:46 +0800
Subject: [PATCH] 20231121_qiuyh_调整巡检打卡、防患举报导出
---
hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml b/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml
index d7fcce8..07cd957 100644
--- a/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml
+++ b/hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml
@@ -39,6 +39,9 @@
<if test="integral != null">
integral,
</if>
+ <if test="level != null">
+ `level`,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides="," >
@@ -74,6 +77,9 @@
</if>
<if test="integral != null">
#{integral,jdbcType=DOUBLE},
+ </if>
+ <if test="level != null">
+ #{level,jdbcType=INTEGER},
</if>
</trim>
</insert>
@@ -113,6 +119,10 @@
<if test="integral != null">
integral = #{integral,jdbcType=DOUBLE},
</if>
+ <if test="level != null">
+ `level` = #{level,jdbcType=INTEGER},
+ </if>
+
</set>
where id=#{id,jdbcType=VARCHAR}
</update>
@@ -135,8 +145,13 @@
t.createUser,
t.updateUser,
t.updateTime,
- t.companyId
+ 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
where t.id=#{id}
</select>
@@ -152,7 +167,10 @@
t.createUser,
t.updateUser,
t.updateTime,
- t.companyId
+ 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
@@ -162,9 +180,39 @@
<if test="startTime!= null and endTime!=null and startTime != '' and endTime !=''">
and t.createTime BETWEEN #{startTime} and #{endTime}
</if>
- order by t.createUser desc
+ order by t.createTime desc
</select>
+ <!--查询列表-->
+ <select id="selectAppList" resultType="com.thhy.secure.modules.biz.hiddenDanger.entity.HiddenDangerEntity">
+ SELECT
+ t.id,
+ t.dangerLocation,
+ 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
+ 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