From a3b023b9152b711c3ce19711a88f1ced520b16d2 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 10:48:18 +0800
Subject: [PATCH] app接口
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 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 df3dad8..be2cde8 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
@@ -33,6 +33,7 @@
<result column="cid" property="cid"/>
<result column="vaddress" property="vaddress"/>
<result column="aaddress" property="aaddress"/>
+ <result column="uids" property="uids"/>
</resultMap>
<sql id="alarmCondition">
@@ -179,7 +180,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.bz,
+ a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,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,
@@ -188,6 +189,7 @@
e.twoId,
e.threeId,
e.deptId,
+ e.street as place,
e.channelNumber from sys_alarm a
LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber
where 1=1
@@ -546,7 +548,7 @@
</select>
<update id="updateVaddress">
- update sys_alarm SET vaddress=#{vaddress} where id=#{jid}
+ update sys_alarm SET vaddress=#{vaddress},uids=#{uids} where id=#{jid}
</update>
<update id="updateAaddress">
--
Gitblit v1.9.3