From fa9ffa9012d7b1df7692bb99e71be6592f48cd4b Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 10 Mar 2021 14:00:19 +0800
Subject: [PATCH] 修改报警器端口

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 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 ac657fa..05d50dc 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,district,province,city,
+        parent_id,district,province,city,serialNumber,channelNumber,
         jd ,
         wd ,
         street,
@@ -70,8 +70,12 @@
             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">
@@ -183,9 +187,9 @@
             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,
+        dept.parent_id,dept.jd,dept.wd,dept.street,u.yname,d.addvnm,dept.addvcd,dept.serialNumber,dept.channelNumber,
         (
         SELECT
         CASE WHEN count(1) > 0 THEN 1 ELSE 0 END

--
Gitblit v1.9.3