瀏覽代碼

巡检路线查看处理

lipenghui 2 月之前
父節點
當前提交
54ad179d63

+ 3 - 5
yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/IotInspectRouteMapper.xml

@@ -10,11 +10,9 @@
      -->
      -->
     <select id="getRoute"
     <select id="getRoute"
             resultType="cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectRouteDO">
             resultType="cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectRouteDO">
-        select* from (select * from (select route.route_name, device.device_name, device.id device_id,route.id, route.item_json,route.create_time from rq_iot_inspect_route route left join
-            rq_iot_device device on
-            route.device_classify = device.asset_class
-                and route.device_id is null)a where a.id not in (select device_id from rq_iot_inspect_route)
-                                                and a.id is not null
+        select* from (select * from (select route.route_name, device.device_name, device.id device_id,route.id, route.item_json,route.create_time from (select * from rq_iot_inspect_route where device_id is null) route
+        left join rq_iot_device device on route.device_classify = device.asset_class)a where a.device_id not in (select device_id from rq_iot_inspect_route where device_id is not null)
+
         union all
         union all
         select route_name, device_name, device_id,id,item_json,create_time from rq_iot_inspect_route where device_id is not null)fin
         select route_name, device_name, device_id,id,item_json,create_time from rq_iot_inspect_route where device_id is not null)fin
         <if test="reqVO.deviceName!=null and reqVO.deviceName!=''">
         <if test="reqVO.deviceName!=null and reqVO.deviceName!=''">