From d06a1424f108c9b321a268b53918bba0a569e7bc Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 13 九月 2023 13:02:55 +0800
Subject: [PATCH] 修改外联历史报警按alarm_time逆序返回数据 修改门禁历史报警按alarm_time逆序返回数据 修改app一键历史报警按create_time逆序返回数据
---
ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml
index f76655f..d69cdc7 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarPumpMapper.xml
@@ -39,7 +39,14 @@
<if test="userId != null and userId != ''"> and user_id = #{userId}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="guideFlag != null "> and guide_flag = #{guideFlag}</if>
+ <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
+ AND alarm_time >= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
+ </if>
+ <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
+ AND alarm_time <= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
+ </if>
</where>
+ order by alarm_time desc
</select>
<select id="selectArdAlarmRadarPumpById" parameterType="String" resultMap="ArdAlarmRadarPumpResult">
@@ -140,7 +147,7 @@
aar.create_time >= ( CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE )
GROUP BY aar.NAME
) r
- INNER JOIN ard_alarm_radar aaar ON r.create_time1 = aaar.create_time
+ INNER JOIN ard_alarm_radar_pump aaar ON r.create_time1 = aaar.create_time
</select>
<update id="updateViewTimeByCondition" parameterType="String">
update ard_alarm_radar_pump
--
Gitblit v1.9.3