From c1a6e23f741e406f7c5503bcfb4eb2e53ae4a36a Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sun, 06 Jun 2021 21:24:24 +0800
Subject: [PATCH] 公安版本初版
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 7 +++----
1 files changed, 3 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 7d4d0fe..a24cbaa 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
@@ -207,8 +207,8 @@
<select id="selectAlarmPage" resultMap="alarmResultMap">
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.deviceNumber,a.region,a.district,a.vaddress,a.aaddress,
+ a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
a.securityArr,a.securityId,
e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
e.stype,
@@ -217,7 +217,7 @@
e.threeId,
e.deptId,
e.manufacturers,
- e.street as place,
+ a.place as place,
e.channelNumber,
u.name as baname,
u.id as baid,
@@ -228,7 +228,6 @@
LEFT JOIN jfpthPublicSecurity.blade_user u ON u.id = a.securityId
where 1=1
<include refid="alarmCondition"></include>
- and a.waringType IN("紧急求救")
ORDER BY
a.jtype ASC,
a.alarmTime DESC
--
Gitblit v1.9.3