From 670bc85ba8468dbe9a427abc54f2bca9d4e71749 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 16:32:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml |   54 +++++++++++++++++++++++++++---------------------------
 1 files changed, 27 insertions(+), 27 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 94cf1ca..9f10dcf 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
@@ -120,10 +120,10 @@
     </sql>
     <sql id="alarmConditionPie">
         <if test="alarm.beginTime!=null and alarm.beginTime!=''">
-            and alarmTime&gt;=#{alarm.beginTime}
+            and DATE_FORMAT(a.alarmTime,'%Y-%m-%d')&gt;=#{alarm.beginTime}
         </if>
         <if test="alarm.endTime!=null and alarm.endTime!=''">
-            and alarmTime&lt;=#{alarm.endTime}
+            and DATE_FORMAT(a.alarmTime,'%Y-%m-%d')&lt;=#{alarm.endTime}
         </if>
         <if test="alarm.timeDesc!=null and alarm.timeDesc!=''">
             <if test="alarm.timeDesc=='30分钟以上'">
@@ -191,7 +191,8 @@
         e.deptId,
         e.street as place,
         e.channelNumber from sys_alarm a
-        LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber
+        LEFT JOIN
+        sys_equipment e on e.deviceNumber=a.deviceNumber
         where 1=1
         <include refid="alarmCondition"></include>
         and a.waringType IN("紧急求救")
@@ -365,35 +366,34 @@
 
 
     <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.deviceNumber,
-        a.region,
-        a.district,
-        a.alarmId,
-        a.LEVEL,
-        a.jd,
-        a.cid,
-        a.wd,
-        a.jtype,
-        a.rname,
-        e.serialNumber,
+        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.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,
         e.stype,
+        e.oneId,
+        e.twoId,
+        e.threeId,
+        e.deptId,
         e.channelNumber,
         jfpth.blade_region.`name` as addvnm
         FROM
-        sys_alarm a LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber LEFT JOIN jfpth.blade_region on jfpth.blade_region.`code`=a.district where
-        DATE_FORMAT(alarmTime,'%Y-%m-%d') &gt;=#{beginTime} and DATE_FORMAT(alarmTime,'%Y-%m-%d') &lt;=#{endTime} and a.waringType  IN("紧急求救") ORDER BY alarmTime desc
+        sys_alarm a
+        LEFT JOIN sys_equipment e
+        on
+        e.deviceNumber=a.deviceNumber
+        LEFT JOIN
+        jfpth.blade_region
+        on
+        jfpth.blade_region.`code`=a.district
+        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
     </select>
 
 

--
Gitblit v1.9.3