From 6971c195601ecc91b2b7b52af83efed9956dcfe0 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 09 Apr 2021 09:22:49 +0800
Subject: [PATCH] 接口提供：根据设备编码
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
index 6b447fe..eeed1f9 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
@@ -187,12 +187,45 @@
</select>
<select id="listAll" resultMap="equipmentResultMap">
- select id,deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,dtype,heartbeat,expireTime,pay,
- parent_id,
- jd ,
- wd ,
- street,state,reason,
- addvcd,pay,expireTime from sys_equipment
+ select equipment.id,equipment.deviceName,equipment.deviceNumber,equipment.deviceType,equipment.ownership
+ ,equipment.ownerId,equipment.devicestate,equipment.stime,equipment.dtype,equipment.heartbeat,equipment.expireTime,
+ equipment.parent_id,equipment.district,equipment.province,equipment.city,equipment.serialNumber,equipment.channelNumber,
+ equipment.jd ,
+ equipment.wd ,
+ equipment.state,equipment.reason,
+ equipment.street,catalog.pid,
+ equipment.oneContacts,equipment.onePhone,equipment.oneId,
+ equipment.twoContacts,equipment.twoPhone,equipment.twoId,
+ equipment.ThreeContacts,equipment.ThreePhone,equipment.threeId,
+ equipment.deptId,
+ equipment.addvcd,equipment.pay,equipment.expireTime from sys_equipment equipment
+ left join sys_catalog catalog on catalog.eqid = equipment.deviceNumber
+ where 1=1
+
+ <if test="equipment.deviceName!=null">
+ and (
+ deviceName like concat('%',#{equipment.deviceName},'%')
+ or deviceNumber like concat('%',#{equipment.deviceName},'%')
+ or street like concat('%',#{equipment.deviceName},'%')
+ )
+ </if>
+ </select>
+
+ <select id="listAlls" resultMap="equipmentResultMap">
+ select equipment.id,equipment.deviceName,equipment.deviceNumber,equipment.deviceType,equipment.ownership
+ ,equipment.ownerId,equipment.devicestate,equipment.stime,equipment.dtype,equipment.heartbeat,equipment.expireTime,
+ equipment.parent_id,equipment.district,equipment.province,equipment.city,equipment.serialNumber,equipment.channelNumber,
+ equipment.jd ,
+ equipment.wd ,
+ equipment.state,equipment.reason,
+ equipment.street,catalog.pid,
+ equipment.oneContacts,equipment.onePhone,equipment.oneId,
+ equipment.twoContacts,equipment.twoPhone,equipment.twoId,
+ equipment.ThreeContacts,equipment.ThreePhone,equipment.threeId,
+ equipment.deptId,
+ equipment.addvcd,equipment.pay,equipment.expireTime from sys_equipment equipment
+ left join sys_catalog catalog on catalog.eqid = equipment.deviceNumber
+ where 1=1
</select>
--
Gitblit v1.9.3