|
|
@@ -12,7 +12,7 @@
|
|
|
resultType="cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectRouteDO">
|
|
|
select * from (SELECT
|
|
|
r.route_name,
|
|
|
- r.device_name,
|
|
|
+ d.device_name,
|
|
|
d.id as device_id,
|
|
|
r.id,
|
|
|
r.item_json,
|
|
|
@@ -34,8 +34,8 @@
|
|
|
)
|
|
|
AND d.id IS NOT NULL and r.deleted=0 and d.deleted=0 and p.deleted=0
|
|
|
union all
|
|
|
- select route_name, device_name, device_id,id,item_json,create_time,dept_id,device_code from rqiot.rq_iot_inspect_route where device_id is not null
|
|
|
- and deleted=0)fin
|
|
|
+ select route_name, device_name, device_id,id,item_json,create_time,dept_id,device_code from rqiot.rq_iot_inspect_route
|
|
|
+ where device_id is not null and deleted=0)fin
|
|
|
<where>
|
|
|
<if test="reqVO.deviceName!=null and reqVO.deviceName!=''">
|
|
|
and fin.device_name LIKE CONCAT('%',#{reqVO.deviceName},'%')
|
