|
|
@@ -147,7 +147,7 @@
|
|
|
t.state,t.location_type_cd locationTypeCd,t.location_obj_id locationObjId,
|
|
|
t.location_type_cd,t.location_obj_id,
|
|
|
td1.name stateName,t.create_time createTime,t.direction,td3.name directionName
|
|
|
- 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'
|
|
|
@@ -272,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'
|
|
|
@@ -280,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'
|
java110