From 284a9a6b482347a9fe65223a3280421d6a65e2e4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 08 May 2021 11:37:17 +0800
Subject: [PATCH] 1.处警队伍列表接口修改 2.近一周警情接口修改，返回一键求助 3.报警设备报警时bug修复，新增判断接警员的在线状态和工作状态是否为空

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 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 276ae43..8343eca 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
@@ -397,7 +397,7 @@
 
     <select id="selectListSe" resultMap="alarmResultMap">
         SELECT
-        a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,a.bz,
+        a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,"一键求助" as waringType,a.bz,
         a.deviceNumber,a.region,a.district,a.vaddress,a.aaddress,
         a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
         e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,

--
Gitblit v1.9.3