From db0b070e51db46e779b8d2ad1d4d213b712602cd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 11 Jan 2021 17:04:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
index 0b92245..63803f2 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
@@ -24,6 +24,9 @@
<result column="wd" property="wd"/>
<result column="jtype" property="jtype"/>
<result column="rname" property="rname"/>
+ <result column="serialNumber" property="serialNumber"/>
+ <result column="stype" property="stype"/>
+ <result column="channelNumber" property="channelNumber"/>
</resultMap>
@@ -69,9 +72,12 @@
a.wd,
a.jtype,
a.rname,
- d.addvnm
+ d.addvnm,
+ e.serialNumber,
+ e.stype,
+ e.channelNumber
FROM
- sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.addvcd where 1=1
+ sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.addvcd LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber where 1=1
<if test="jtype!=null and jtype!=''">
and a.jtype=#{jtype}
</if>
@@ -143,9 +149,12 @@
a.jd,
a.wd,
a.jtype,
- d.addvnm
+ d.addvnm,
+ e.serialNumber,
+ e.stype,
+ e.channelNumber
FROM
- sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.addvcd where 1=1
+ sys_alarm a LEFT JOIN sys_district d on d.addvcds=a.addvcd LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber where 1=1
<if test="id!=null and id!=''">
and a.id >#{id}
</if>
--
Gitblit v1.9.3