From d1757c919b264de219decf4e8c9be0bf49cd926e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 19 Jun 2021 18:22:08 +0800
Subject: [PATCH] 意见反馈新增接口 saves 修改，区分是意见反馈插入还是调查反馈上报插入

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 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 a5531c6..ef20253 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,
@@ -422,7 +422,6 @@
         where
         DATE_FORMAT(alarmTime,'%Y-%m-%d') &gt;=#{beginTime}
         and DATE_FORMAT(alarmTime,'%Y-%m-%d') &lt;=#{endTime}
-        and a.waringType  IN("紧急求救")
         ORDER BY
         a.jtype ASC,
         a.alarmTime DESC
@@ -451,7 +450,7 @@
     <select id="selectAlarmCount" resultType="java.lang.Integer">
         SELECT count(*) FROM `sys_alarm`
         where
-        waringType = '紧急求救'
+        1=1
         <if test="conditionVo.status==0">
             and to_days(alarmTime) = to_days(curdate())
         </if>
@@ -482,7 +481,7 @@
 		left join
 	    (
 	    select DATE_FORMAT(alarmTime,'%Y-%m-%d') as datetime, count(*) as count from sys_alarm
-	        where waringType = '紧急求救'
+	        where 1=1
             group by DATE_FORMAT(alarmTime,'%Y-%m-%d')
 	    ) b
 		 on
@@ -514,7 +513,7 @@
     <!--查询本日，本周，本月 主动报警的数量-->
     <select id="selectAlarmSum" resultType="java.util.HashMap">
         select '一键求助' name,ifnull(count(*),0 ) value from sys_alarm
-        where waringType = '紧急求救'
+        where 1=1
         <if test="conditionVo.status==0">
             and to_days(alarmTime) = to_days(now())
         </if>
@@ -604,7 +603,7 @@
         e.threeId,
         e.deptId,
         e.deviceName,
-        e.street as place,
+        a.place as place,
         e.channelNumber
         FROM
             sys_alarm a
@@ -636,7 +635,7 @@
         e.threeId,
         e.deptId,
         e.deviceName,
-        e.street as place,
+        a.place as place,
         e.channelNumber
         FROM
             sys_alarm a
@@ -665,7 +664,7 @@
 
     <select id="selAlarmTimeCount" resultType="java.lang.Integer">
         select count(*) from sys_alarm
-        where waringType = '紧急求救'
+        where 1=1
         <if test="conditionVo.startTime!=null and conditionVo.startTime!='' and conditionVo.endTime!=null and conditionVo.endTime!=''">
             and alarmTime between #{conditionVo.startTime} and #{conditionVo.endTime}
         </if>
@@ -674,7 +673,7 @@
     <!--查询当前时间段内一键求助报警的数据集合-->
     <select id="selectAlarmList" resultType="org.springblade.jfpt.alarm.entity.Alarm">
         SELECT waringType,alarmTime,alarmId,alarmPeople,jtype,czTime FROM `sys_alarm`
-        where waringType='紧急求救'
+        where 1=1
         and alarmTime between #{conditionVo.startTime} and #{conditionVo.endTime}
     </select>
 
@@ -691,7 +690,7 @@
         left join
         (
             select DATE_FORMAT(alarmTime,'%Y-%m-%d') as datetime, count(*) as count from sys_alarm
-            where waringType = '紧急求救'
+            where 1=1
             group by DATE_FORMAT(alarmTime,'%Y-%m-%d')
         ) b
         on
@@ -714,7 +713,7 @@
                 YEAR ( alarmTime ) = date_format(now(),'%Y%')
                 AND MONTH ( alarmTime ) = #{item}
 
-                AND waringType = "紧急求救"
+                AND 1=1
                 AND deviceNumber = #{deviceNumber}
 
             </foreach>
@@ -733,7 +732,6 @@
         LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber
         where 1=1
         <include refid="alarmCondition"></include>
-        and a.waringType IN("紧急求救")
         ORDER BY
         a.jtype ASC,
         a.alarmTime DESC
@@ -742,7 +740,7 @@
     <!--获取实时警情图表统计数据-->
     <select id="getAlarmPie" resultType="org.springblade.common.entity.ReportReturnData">
         select if(1=1,"一键求助",0) type,ifnull(count(*),0) count from sys_alarm
-        where waringType="紧急求救"
+        where 1=1
         <include refid="alarmConditionPie"></include>
     </select>
 

--
Gitblit v1.9.3