From 39a88b3fd870ad8a65f356561b42d465c4f2fc42 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 26 九月 2023 09:35:28 +0800
Subject: [PATCH] 设备健康列表

---
 ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml
index b27f048..a35adc3 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmWallMapper.xml
@@ -44,11 +44,18 @@
             <if test="wallName != null  and wallName != ''">and wall_name = #{wallName}</if>
             <if test="userId != null  and userId != ''">and user_id = #{userId}</if>
             <if test="alarmType != null  and alarmType != ''">and alarm_type = #{alarmType}</if>
-            <if test="alarmTime != null ">and alarm_time = #{alarmTime}</if>
+<!--            <if test="alarmTime != null ">and alarm_time = #{alarmTime}</if>-->
             <if test="longitude != null ">and longitude = #{longitude}</if>
             <if test="latitude != null ">and latitude = #{latitude}</if>
             <if test="altitude != null ">and altitude = #{altitude}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
+                AND alarm_time &gt;= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
+                AND alarm_time &lt;= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
+            </if>
         </where>
+        order by alarm_time desc
     </select>
 
     <select id="selectArdAlarmWallById" parameterType="String" resultMap="ArdAlarmWallResult">
@@ -137,8 +144,7 @@
                         aaa.longitude,
                         aaa.latitude,
                         aaa.altitude,
-                        ROW_NUMBER() OVER ( PARTITION BY aaa.wall_NAME ORDER BY aaa.alarm_time DESC ) AS rn,
-                        COUNT(CASE WHEN aaa.view_time IS NULL THEN 1 END) OVER ( PARTITION BY aaa.wall_NAME ) AS COUNT,
+                        ROW_NUMBER() OVER ( PARTITION BY aaa.wall_NAME ORDER BY aaa.alarm_time DESC ) AS rn, COUNT(CASE WHEN aaa.view_time IS NULL THEN 1 END) OVER ( PARTITION BY aaa.wall_NAME ) AS COUNT,
 		                COUNT ( aaa.alarm_time ) OVER ( PARTITION BY aaa.wall_NAME ) AS total
                  FROM
                      ard_alarm_wall aaa

--
Gitblit v1.9.3