wuxw
2019-11-30 895a4fd070c30259e1ebfa0c4ef8da13fdff7af7
java110-db/src/main/resources/mapper/hardwareAdapation/MachineServiceDaoImplMapper.xml
@@ -137,16 +137,16 @@
        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,
        td1.name stateName,t2.name locationTypeName
        td1.name stateName,td2.name locationTypeName
        from machine t,t_dict td,t_dict td1,t_dict td2
        where 1 =1
        and t.machine_type_cd=td.status_cd
        and td.table_name='machine'
        and td.table_columns='machine_type_cd'
        and td.state = td1.status_cd
        and t.state = td1.status_cd
        and td1.table_name='machine'
        and td1.table_columns='state'
        and td.location_type_cd = td2.status_cd
        and t.location_type_cd = td2.status_cd
        and td2.table_name='machine'
        and td2.table_columns='location_type_cd'
        <if test="machineMac !=null and machineMac != ''">
@@ -255,10 +255,10 @@
        and t.machine_type_cd=td.status_cd
        and td.table_name='machine'
        and td.table_columns='machine_type_cd'
        and td.state = td1.status_cd
        and t.state = td1.status_cd
        and td1.table_name='machine'
        and td1.table_columns='state'
        and td.location_type_cd = td2.status_cd
        and t.location_type_cd = td2.status_cd
        and td2.table_name='machine'
        and td2.table_columns='location_type_cd'
        <if test="machineMac !=null and machineMac != ''">