From bab4e38aaade8d04e432313ad4a6ff3dc8557b25 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 09 Mar 2021 16:51:29 +0800
Subject: [PATCH] 解决警情分发的编辑问题

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 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..359d59f 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,
@@ -70,9 +70,24 @@
             and (deviceName like concat('%',#{equipment.deviceName},'%') or deviceNumber like
             concat('%',#{equipment.deviceName},'%'))
         </if>
-        <if test="equipment.addvcd!=null">
-            and addvcd=#{equipment.addvcd}
+
+        <if test="equipment.beginTime!=null and equipment.beginTime!=''">
+            and expireTime&gt;=#{equipment.beginTime}
         </if>
+        <if test="equipment.endTime!=null and equipment.endTime!=''">
+            and expireTime&lt;=#{equipment.endTime}
+        </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>
@@ -97,6 +112,15 @@
 
     <select id="tree" resultMap="treeNodeResultMap">
           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>
 
 
@@ -163,7 +187,7 @@
             parameterType="org.springblade.jfpt.equipment.entity.Equipment">
         SELECT
         dept.id,dept.deviceName,dept.deviceNumber,dept.deviceType,dept.ownership,
-        dept.ownerId,dept.devicestate,dept.stime,
+        dept.ownerId,dept.devicestate,dept.stime,dept.district,dept.province,dept.city,
         ST_ASTEXT(dept.coordinate) as coordinate,dept.dtype,dept.expireTime,dept.heartbeat,
         dept.parent_id,dept.jd,dept.wd,dept.street,u.yname,d.addvnm,dept.addvcd,
         (

--
Gitblit v1.9.3