From d812ded709006660c6eed3769401fda954535713 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 13 九月 2023 17:17:15 +0800
Subject: [PATCH] 设备健康新接口

---
 ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
index e6704b4..1648d93 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMoveMapper.xml
@@ -40,7 +40,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 &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="selectArdAlarmRadarMoveById" parameterType="String" resultMap="ArdAlarmRadarMoveResult">
@@ -139,12 +146,13 @@
                  count(case when aar.view_time is null THEN 1  END) as count,
 	             count(aar.id) as total
              FROM
-                 ard_alarm_radar aar
+                 ard_alarm_radar_move aar
              WHERE
                  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_move aaar ON r.create_time1 = aaar.create_time
+        ORDER BY aaar.create_time desc
     </select>
     <update id="updateViewTimeByCondition" parameterType="String">
         update ard_alarm_radar_move

--
Gitblit v1.9.3