From 83ea655f2d36ab319d2dfe885947957c550d4f64 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期一, 13 十一月 2023 14:17:26 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/secure/src/main/resources/mapping/HiddenDangerMapper.xml | 24 +++++++++++++++++++++---
1 files changed, 21 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..bfe90fd 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,7 +180,7 @@
<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>
<!--根据ID删除-->
--
Gitblit v1.9.3