From afda08833e460a40a2d4e509f9df9d809c6f8f31 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 26 Mar 2021 15:38:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml |   72 ++++++++++++++++++++++++++++++++----
 1 files changed, 64 insertions(+), 8 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 46e9ac8..a3394ff 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
@@ -69,6 +69,10 @@
         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
 
@@ -106,6 +110,62 @@
 
         <if test="childList!=null and childList.size>0">
             and deviceNumber in
+            <foreach collection="childList" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
+    </select>
+
+    <select id="selectDeptPages" 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
+
+        <if test="equipment.deviceName!=null">
+            and (deviceName like concat('%',#{equipment.deviceName},'%') or deviceNumber like
+            concat('%',#{equipment.deviceName},'%'))
+        </if>
+
+        <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>
+
+        <if test="equipment.dtype!=null">
+            and dtype=#{equipment.dtype}
+        </if>
+
+        <if test="childList!=null and childList.size>0">
+            and deptId in
             <foreach collection="childList" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
@@ -184,20 +244,16 @@
         update sys_equipment SET devicestate = 0 where id in (${arr})
     </update>
 
-    <update id="updateOnes" parameterType="org.springblade.jfpt.equipment.entity.Equipment">
-    update sys_equipment SET deviceName=#{deviceName},deviceNumber=#{deviceNumber},deviceType=#{deviceType},
-    ownership=#{ownership},ownerId=#{yname},devicestate=#{devicestate},stime=#{stime},
-    coordinate=POINT(#{jd},#{wd}),parent_id=#{parentId},jd=#{jd},wd=#{wd},addvcd=#{addvnm},street=#{streeName},dtype=#{dtype} where id=#{id}
-</update>
-
-
     <select id="selectInfo" resultMap="deptVOResultMap"
             parameterType="org.springblade.jfpt.equipment.entity.Equipment">
         SELECT
-        dept.id,dept.deviceName,dept.deviceNumber,dept.deviceType,dept.ownership,
+        dept.deptId,dept.id,dept.deviceName,dept.deviceNumber,dept.deviceType,dept.ownership,
         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.state,dept.reason,
         dept.parent_id,dept.jd,dept.wd,dept.street,u.yname,d.addvnm,dept.addvcd,dept.serialNumber,dept.channelNumber,
+        dept.oneContacts,dept.onePhone,dept.oneId,
+        dept.twoContacts,dept.twoPhone,dept.twoId,
+        dept.ThreeContacts,dept.ThreePhone,dept.threeId,
         (
         SELECT
         CASE WHEN count(1) > 0 THEN 1 ELSE 0 END

--
Gitblit v1.9.3