From f3e1ec804ee6c86be99fdc1fd378d4fa467bb7b7 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 27 Jul 2021 10:46:47 +0800
Subject: [PATCH] 添加时间筛选

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml |   64 ++++++++++++++++++++++++++++++++
 1 files changed, 64 insertions(+), 0 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 eb7f98a..5d1f7f7 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
@@ -275,6 +275,14 @@
             sys_alarm
         WHERE
             1 = 1
+
+        <if test="beginTime!=null and beginTime!=''">
+            and alarmTime&gt;=#{beginTime}
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            and alarmTime&lt;=#{endTime}
+        </if>
+
             AND jtype = 0
             AND waringType IN ( "安装任务" ) UNION ALL
         SELECT
@@ -284,6 +292,14 @@
             sys_alarm
         WHERE
             1 = 1
+
+        <if test="beginTime!=null and beginTime!=''">
+            and alarmTime&gt;=#{beginTime}
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            and alarmTime&lt;=#{endTime}
+        </if>
+
             AND jtype = 2
             AND waringType IN ( "安装任务" )
     </select>
@@ -297,6 +313,14 @@
             sys_alarm
         WHERE
             1 = 1
+
+        <if test="beginTime!=null and beginTime!=''">
+            and alarmTime&gt;=#{beginTime}
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            and alarmTime&lt;=#{endTime}
+        </if>
+
             AND jtype = 0
             AND waringType IN ( "紧急求救" ) UNION ALL
         SELECT
@@ -308,6 +332,14 @@
             sys_alarm
         WHERE
             1 = 1
+
+        <if test="beginTime!=null and beginTime!=''">
+            and alarmTime&gt;=#{beginTime}
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            and alarmTime&lt;=#{endTime}
+        </if>
+
             AND jtype = 1
             AND waringType IN ( "紧急求救" )
             UNION ALL
@@ -320,6 +352,14 @@
             sys_alarm
         WHERE
             1 = 1
+
+        <if test="beginTime!=null and beginTime!=''">
+            and alarmTime&gt;=#{beginTime}
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            and alarmTime&lt;=#{endTime}
+        </if>
+
             AND jtype = 2
             AND waringType IN ( "紧急求救" )
     </select>
@@ -333,6 +373,14 @@
             sys_alarm
         WHERE
             1 = 1
+
+        <if test="beginTime!=null and beginTime!=''">
+            and alarmTime&gt;=#{beginTime}
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            and alarmTime&lt;=#{endTime}
+        </if>
+
             AND alarmbs = 0
             AND waringType IN ( "紧急求救" ) UNION ALL
         SELECT
@@ -344,6 +392,14 @@
             sys_alarm
         WHERE
             1 = 1
+
+        <if test="beginTime!=null and beginTime!=''">
+            and alarmTime&gt;=#{beginTime}
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            and alarmTime&lt;=#{endTime}
+        </if>
+
             AND alarmbs = 1
             AND waringType IN ( "紧急求救" )
             UNION ALL
@@ -356,6 +412,14 @@
             sys_alarm
         WHERE
             1 = 1
+
+        <if test="beginTime!=null and beginTime!=''">
+            and alarmTime&gt;=#{beginTime}
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            and alarmTime&lt;=#{endTime}
+        </if>
+
             AND alarmbs = 2
             AND waringType IN ( "紧急求救" )
     </select>

--
Gitblit v1.9.3