From f1595ff272b3e2c6d774ae435df66707a8056f33 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 08 Apr 2021 16:06:28 +0800
Subject: [PATCH] 设备集合查询
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 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 49524a1..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
@@ -201,6 +201,31 @@
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