From d5b43ef0da42eaf50a08ce17e5fd3351eeb26a5e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 20 Mar 2021 14:10:19 +0800
Subject: [PATCH] 违禁品筛选条件去除，警情统计接口修改

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 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 b120c62..cba9173 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
@@ -36,7 +36,7 @@
 
     <select id="selectAlarmPage" resultMap="alarmResultMap">
         select
-        a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,
+        a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,a.bz,
         a.deviceNumber,a.region,a.district,
         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,
@@ -75,7 +75,7 @@
             and a.alarmTime&lt;=#{alarm.endTime}
         </if>
 
-        and a.waringType NOT IN("系统测试","主机重新上电")
+        and a.waringType IN("紧急求救")
 
         ORDER BY
         a.jtype ASC,
@@ -277,16 +277,18 @@
 
 
     <update id="updateJtype">
-        update sys_alarm SET jtype=1,czTime=#{czTime},bz=#{bz} where id=#{id}
+        update sys_alarm SET jtype=#{jtype},bz=#{bz},jjTime=#{jjtime} where id=#{id}
+    </update>
+
+    <update id="updatePoliceStatus">
+        update jfpth.blade_user SET work_status=#{status} where id=#{id}
     </update>
 
     <!--查询当天警情总数-->
     <select id="selectAlarmCount" resultType="java.lang.Integer">
         SELECT count(*) FROM `sys_alarm`
             where
-        waringType != '系统测试'
-            and
-        waringType!='主机重新上电'
+        waringType = '紧急求救'
             and
         to_days(alarmTime) = to_days(curdate())
     </select>
@@ -313,7 +315,7 @@
 		left join
 	    (
 	    select DATE_FORMAT(alarmTime,'%Y-%m-%d') as datetime, count(*) as count from sys_alarm
-	        where alarmType = '一键求助'
+	        where waringType = '紧急求救'
             group by DATE_FORMAT(alarmTime,'%Y-%m-%d')
 	    ) b
 		 on
@@ -345,7 +347,7 @@
     <!--查询本日，本周，本月 主动报警的数量-->
     <select id="selectAlarmSum" resultType="java.util.HashMap">
         select '一键求助' name,ifnull(count(*),0 ) value from sys_alarm
-        where alarmType = '一键求助'
+        where waringType = '紧急求救'
         <if test="conditionVo.status==0">
             and to_days(alarmTime) = to_days(now())
         </if>
@@ -357,7 +359,7 @@
         </if>
         union all
         select '电话报警' name,ifnull(count(*),0 ) value from sys_alarm
-        where alarmType = '电话报警'
+        where waringType = '电话报警'
         <if test="conditionVo.status==0">
             and to_days(alarmTime) = to_days(now())
         </if>

--
Gitblit v1.9.3