From 3907fe59aaf258260a1289a13673d3905f7f0023 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 29 Jan 2021 11:45:06 +0800
Subject: [PATCH] 初版

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 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 66e9604..e5ad292 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
@@ -29,6 +29,7 @@
         <result column="channelNumber" property="channelNumber"/>
         <result column="czTime" property="czTime"/>
         <result column="bz" property="bz"/>
+        <result column="name" property="name"/>
     </resultMap>
 
 
@@ -106,7 +107,7 @@
         <if test="jtype!=null and jtype!=''">
             and a.jtype=#{jtype}
         </if>
-        <if test="district!=null and district!=''">
+        <if test="addvcd!=null and addvcd!=''">
             and a.district=#{district}
         </if>
         <if test="waringType!=null and waringType!=''">
@@ -201,7 +202,8 @@
     <update id="updateOne" parameterType="org.springblade.jfpt.alarm.entity.Alarm">
     update sys_alarm SET alarmType=#{alarmType},alarmPeople=#{alarmPeople},alarmTime=#{alarmTime},
     galarmPeople=#{galarmPeople},sex=#{sex},phoneNumber=#{phoneNumber},place=#{place},
-    content=#{content},waringType=#{waringType},deviceNumber=#{deviceNumber},region=#{region},district=#{district},alarmId=#{alarmId},level=#{level},rname=#{rname},jd=#{jd},wd=#{wd},coordinate=POINT(#{jd},#{wd}),jtype=#{jtype} where id=#{id}
+    content=#{content},waringType=#{waringType},deviceNumber=#{deviceNumber},region=#{region},district=#{district},alarmId=#{alarmId},level=#{level},rname=#{rname},jd=#{jd},wd=#{wd},
+    coordinate=POINT(#{jd},#{wd}),jtype=#{jtype},province=#{province},city=#{city} where id=#{id}
 </update>
 
 
@@ -232,12 +234,12 @@
         a.wd,
         a.jtype,
         a.rname,
-        d.addvnm,
         e.serialNumber,
         e.stype,
-        e.channelNumber
+        e.channelNumber,
+        jfpth.blade_region.`name`
         FROM
-        sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.district LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber where
+        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} ORDER BY alarmTime desc
     </select>
 

--
Gitblit v1.9.3