From 853ef07e2d6ce1eaa000927d8bfd9ff93ffb8b06 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 15 Jul 2021 14:15:50 +0800
Subject: [PATCH] 警情任务分类显示问题修复
---
src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 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 efc8c38..6d5ad03 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
@@ -648,7 +648,7 @@
<sql id="getAlarmListSqlParam">
select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.content,a.waringType,a.bz,
a.deviceNumber,a.region,e.district,a.vaddress,a.aaddress,
- a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,e.province,e.city,a.cid,
+ a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,e.province,e.city,a.cid,
a.securityArr,a.securityId,
e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
e.stype,
@@ -667,17 +667,37 @@
</sql>
<!--查询当前保安所有警情信息-->
+<!-- <select id="getAllAlarmList" resultMap="alarmResultMap">-->
+<!-- (select * from (-->
+<!-- <include refid="getAlarmListSqlParam"/>-->
+<!-- and securityId =#{alarm.securityId} and jtype = 1 order by alarmTime limit 9999-->
+<!-- )a)-->
+<!-- union-->
+<!-- (select * from (-->
+<!-- <include refid="getAlarmListSqlParam"/>-->
+<!-- and securityId = "" or securityId IS NULL-->
+<!-- AND securityArr LIKE concat('%',#{alarm.securityId},'%')-->
+<!-- order by alarmTime desc limit 9999-->
+<!-- )a)-->
+<!-- union-->
+<!-- (select * from (-->
+<!-- <include refid="getAlarmListSqlParam"/>-->
+<!-- and securityId =#{alarm.securityId} and jtype = 2 order by alarmTime desc limit 9999-->
+<!-- )a)-->
+<!-- </select>-->
+
+ <!--查询当前保安所有警情信息-->
<select id="getAllAlarmList" resultMap="alarmResultMap">
- (select * from (
- <include refid="getAlarmListSqlParam"/>
- and securityId =#{alarm.securityId} and jtype = 1 order by alarmTime limit 9999
- )a)
- union
(select * from (
<include refid="getAlarmListSqlParam"/>
and securityId = "" or securityId IS NULL
AND securityArr LIKE concat('%',#{alarm.securityId},'%')
order by alarmTime desc limit 9999
+ )a)
+ union
+ (select * from (
+ <include refid="getAlarmListSqlParam"/>
+ and securityId =#{alarm.securityId} and jtype = 1 order by alarmTime limit 9999
)a)
union
(select * from (
@@ -698,6 +718,10 @@
and securityId =#{alarm.securityId} and jtype = 2
order by alarmTime desc
</if>
+ <if test="alarm.status==4">
+ and securityId =#{alarm.securityId} and jtype = 1
+ order by alarmTime desc
+ </if>
</select>
<!--获取警情数量的集合,全部，未处理，已处理的数量-->
@@ -707,14 +731,18 @@
or securityId = "" or securityId IS NULL
and securityArr LIKE concat('%',#{alarm.securityId},'%'))
- union
+ UNION ALL
(select ifnull(count(*),0) number from sys_alarm
where securityId = "" or securityId IS NULL
and securityArr LIKE concat('%',#{alarm.securityId},'%'))
- union
+ UNION ALL
(select ifnull(count(*),0) number from sys_alarm
where securityId =#{alarm.securityId} and jtype = 2)
+
+ UNION ALL
+ (select ifnull(count(*),0) number from sys_alarm
+ where securityId =#{alarm.securityId} and jtype = 1)
</select>
<update id="setAlarm">
--
Gitblit v1.9.3