From 9d1da9f5e2034645f4836deb95e3d2486cbf6f72 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 04 六月 2020 22:06:43 +0800
Subject: [PATCH] 加入 查询设备

---
 java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml
index a86d692..7ca9a5a 100644
--- a/java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml
@@ -146,8 +146,8 @@
         machineTypeCd,t.machine_ip,t.machine_ip machineIp,td.name machineTypeCdName,
         t.state,t.location_type_cd locationTypeCd,t.location_obj_id locationObjId,
         t.location_type_cd,t.location_obj_id,
-        td1.name stateName,td2.name locationTypeName,t.create_time createTime,t.direction,td3.name directionName
-        from machine t,t_dict td,t_dict td1,t_dict td2,t_dict td3
+        td1.name stateName,t.create_time createTime,t.direction,td3.name directionName
+        from machine t,t_dict td,t_dict td1,t_dict td3
         where 1 =1
         and t.machine_type_cd=td.status_cd
         and td.table_name='machine'
@@ -155,9 +155,6 @@
         and t.state = td1.status_cd
         and td1.table_name='machine'
         and td1.table_columns='state'
-        and t.location_type_cd = td2.status_cd
-        and td2.table_name='machine'
-        and td2.table_columns='location_type_cd'
         and t.direction = td3.status_cd
         and td3.table_name='machine'
         and td3.table_columns='direction'
@@ -275,7 +272,7 @@
     <!-- 鏌ヨ璁惧鏁伴噺 add by wuxw 2018-07-03 -->
     <select id="queryMachinesCount" parameterType="Map" resultType="Map">
         select count(1) count
-        from machine t,t_dict td,t_dict td1,t_dict td2,t_dict td3
+        from machine t,t_dict td,t_dict td1,t_dict td3
         where 1 =1
         and t.machine_type_cd=td.status_cd
         and td.table_name='machine'
@@ -283,9 +280,6 @@
         and t.state = td1.status_cd
         and td1.table_name='machine'
         and td1.table_columns='state'
-        and t.location_type_cd = td2.status_cd
-        and td2.table_name='machine'
-        and td2.table_columns='location_type_cd'
         and t.direction = td3.status_cd
         and td3.table_name='machine'
         and td3.table_columns='direction'

--
Gitblit v1.8.0