From 12c0569a2943c43e5dd71f35a41f32b59d8c9eea Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 21 Jul 2021 09:00:45 +0800
Subject: [PATCH] 巡逻任务
---
src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
index 35eaed9..f3b1774 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
@@ -713,7 +713,7 @@
<select id="getAllAlarmList" resultMap="alarmResultMap">
(select * from (
<include refid="getAlarmListSqlParam"/>
- and securityId = "" or securityId IS NULL
+ and (securityId = "" or securityId IS NULL)
AND securityArr LIKE concat('%',#{alarm.securityId},'%')
order by alarmTime desc limit 9999
)a)
@@ -733,7 +733,7 @@
<select id="getAlarmList" resultMap="alarmResultMap">
<include refid="getAlarmListSqlParam"/>
<if test="alarm.status==2">
- and securityId = "" or securityId IS NULL
+ and (securityId = "" or securityId IS NULL)
AND securityArr LIKE concat('%',#{alarm.securityId},'%')
order by alarmTime desc
</if>
@@ -751,7 +751,7 @@
<select id="getAlarmNumber" resultType="java.lang.Integer">
(select ifnull(count(*),0) number from sys_alarm
where securityId =#{alarm.securityId}
- or securityId = "" or securityId IS NULL
+ or (securityId = "" or securityId IS NULL)
and securityArr LIKE concat('%',#{alarm.securityId},'%'))
UNION ALL
@@ -793,8 +793,8 @@
<select id="getPatrolList" resultMap="alarmResultMap">
<include refid="getPatrolListSqlParam"/>
<if test="alarm.status==2">
- and (securityId = "" or securityId IS NULL
- AND securityArr LIKE concat('%',#{alarm.securityId},'%'))
+ and (securityId = "" or securityId IS NULL)
+ AND securityArr LIKE concat('%',#{alarm.securityId},'%')
order by alarmTime desc
</if>
<if test="alarm.status==3">
@@ -810,32 +810,31 @@
<!--获取巡逻数量的集合,全部，未处理，已处理的数量-->
<select id="getPatrolNumber" resultType="java.lang.Integer">
(select ifnull(count(*),0) number from sys_alarm
- where
- alarmType = "巡逻任务" AND
+ where alarmType = '巡逻任务' AND
(securityId =#{alarm.securityId}
or securityId = "" or securityId IS NULL
and securityArr LIKE concat('%',#{alarm.securityId},'%'))
)
- UNION ALL
+ UNION all
(select ifnull(count(*),0) number from sys_alarm
- where
- alarmType = "巡逻任务" AND
+ where alarmType = '巡逻任务' AND
(securityId = "" or securityId IS NULL
and securityArr LIKE concat('%',#{alarm.securityId},'%'))
)
- UNION ALL
+ UNION all
(select ifnull(count(*),0) number from sys_alarm
where
- alarmType = "巡逻任务" AND
+ alarmType = '巡逻任务' AND
securityId =#{alarm.securityId} and jtype = 2)
- UNION ALL
+ UNION all
(select ifnull(count(*),0) number from sys_alarm
where
- alarmType = "巡逻任务" AND
+ alarmType = '巡逻任务' AND
securityId =#{alarm.securityId} and jtype = 1)
+
</select>
<update id="setAlarm">
--
Gitblit v1.9.3