From c7d05af4e7ebf92b67308df21bde17282c0c50f1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 06 May 2021 21:44:06 +0800
Subject: [PATCH] 1.警情导出bug修复 2.警情统计接口修改 3.一键报警设备接收报文时修改设备状态

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
index 1deb79f..c4061ba 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -82,16 +82,16 @@
         <if test="alarm.level!=null">
             and a.level like concat('%',#{alarm.level},'%')
         </if>
-        <if test="alarm.waringType!=null">
+        <if test="alarm.waringType!=null and alarm.waringType!='undefined'">
             and a.waringType like concat('%',#{alarm.waringType},'%')
         </if>
-        <if test="alarm.beginTime!=null and alarm.beginTime!=''">
+        <if test="alarm.beginTime!=null and alarm.beginTime!='' and alarm.beginTime!='undefined'">
             and a.alarmTime&gt;=#{alarm.beginTime}
         </if>
-        <if test="alarm.endTime!=null and alarm.endTime!=''">
+        <if test="alarm.endTime!=null and alarm.endTime!='' and alarm.endTime!='undefined'">
             and a.alarmTime&lt;=#{alarm.endTime}
         </if>
-        <if test="alarm.timeDesc!=null and alarm.timeDesc!=''">
+        <if test="alarm.timeDesc!=null and alarm.timeDesc!='' and alarm.timeDesc!='undefined'">
             <if test="alarm.timeDesc=='30分钟以上'">
                 and czTime-alarmTime>1800
             </if>
@@ -692,6 +692,7 @@
         ) b
         on
         a.days = b.datetime
+        order by days
     </select>
 
 

--
Gitblit v1.9.3