From d0f916ba36c1cfa956ea633c9118184294560b38 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 29 十一月 2019 21:12:15 +0800
Subject: [PATCH] 优化设备位置
---
java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml
index 97757e5..038b81c 100644
--- a/java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml
@@ -136,12 +136,16 @@
machineVersion,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id
bId,t.machine_name,t.machine_name machineName,t.machine_type_cd,t.machine_type_cd
machineTypeCd,t.machine_ip,t.machine_ip machineIp,td.name machineTypeCdName,
- t.state,t.location_type_cd locationTypeCd,t.location_obj_id locationObjId
- from machine t,t_dict td
+ t.state,t.location_type_cd locationTypeCd,t.location_obj_id locationObjId,
+ td1.name stateName
+ from machine t,t_dict td,t_dict td1
where 1 =1
and t.machine_type_cd=td.status_cd
and td.table_name='machine'
and td.table_columns='machine_type_cd'
+ and td1.state = td1.status_cd
+ and td1.table_name='machine'
+ and td1.table_columns='state'
<if test="machineMac !=null and machineMac != ''">
and t.machine_mac= #{machineMac}
</if>
--
Gitblit v1.8.0