diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml index 48c0306..06abbb9 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml @@ -656,7 +656,7 @@ b.alg_type, d.alg_subtype_name as alg_name from patrol_result a - left join result_analysis b on a.line_id = b.business_id + left join result_analysis b on a.line_id = b.business_id and a.task_patrolled_id = b.task_patrol_id and a.device_id = b.objectId left join basedata_alg_subtype d on b.alg_type = d.alg_subtype_code left join patrol_task_info c on a.task_code = c.task_major_id and a.device_id = c.device_id diff --git a/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontPatDevPatRouteMapper.xml b/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontPatDevPatRouteMapper.xml index ba3a5e7..3c492fe 100644 --- a/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontPatDevPatRouteMapper.xml +++ b/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontPatDevPatRouteMapper.xml @@ -141,7 +141,7 @@ ORDER BY time DESC LIMIT 1) - and patrol_device_code=#{patrolDeviceCode} + and patrol_device_code=#{patrolDeviceCode} order by time desc limit 10