From 33d0574e951c9d8dfb7441259e8d38d8ca7f4c65 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 01 Feb 2021 23:40:54 +0800
Subject: [PATCH] 初版
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 8e925ff..ac657fa 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
@@ -61,7 +61,7 @@
<select id="selectEquipmentPage" resultMap="equipmentResultMap">
select id,deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,dtype,heartbeat,expireTime,pay,
- parent_id,
+ parent_id,district,province,city,
jd ,
wd ,
street,
@@ -73,6 +73,17 @@
<if test="equipment.addvcd!=null">
and addvcd=#{equipment.addvcd}
</if>
+
+ <if test="equipment.district!=null">
+ and district like concat('%',#{equipment.district},'%')
+ </if>
+ <if test="equipment.province!=null">
+ and province like concat('%',#{equipment.province},'%')
+ </if>
+ <if test="equipment.city!=null">
+ and city like concat('%',#{equipment.city},'%')
+ </if>
+
<if test="equipment.devicestate!=null">
and devicestate =#{equipment.devicestate}
</if>
@@ -99,6 +110,15 @@
select id, parent_id, deviceName as title, id as "value", id as "key" from sys_equipment
</select>
+ <select id="listAll" resultMap="equipmentResultMap">
+ select id,deviceName,deviceNumber,deviceType,ownership,ownerId,devicestate,stime,dtype,heartbeat,expireTime,pay,
+ parent_id,
+ jd ,
+ wd ,
+ street,
+ addvcd,pay,expireTime from sys_equipment
+ </select>
+
<select id="lazyList" resultMap="deptVOResultMap">
SELECT dept.id,dept.deviceName,dept.deviceNumber,dept.deviceType,dept.ownership,
--
Gitblit v1.9.3