现场联调问题修改

inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java

@@ -567,7 +567,7 @@ public class JobMainTask {
 
         PatrolPresetPos patrolPresetPos = PatrolPresetPos.builder()
                 .patrolPointId(Long.parseLong(patrolTaskInfo.getDeviceId()))
-                .patrolDeviceCode(patrolTaskInfo.getDevNo())
+//                .patrolDeviceCode(patrolTaskInfo.getDevNo())
                 .isEnable("1")
                 .build();
         log.info(Color.RED + "[JOB] prePointExec, info, deviceId= {}, devNo= {}, patrolPresetPos={}" + Color.END, patrolTaskInfo.getDeviceId(), patrolTaskInfo.getDevNo(), patrolPresetPos);

inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml

@@ -480,7 +480,7 @@
                d.area_name   as jg_name,
                e.area_name
         from patrol_result f
-                 left join basedata_patrolpoint a on f.device_id = a.patrol_point_id
+                 left join basedata_patrolpoint a on f.device_id = a.patrol_point_id OR f.device_name = a.patrol_point_name
                  left join basedata_device b on a.device_id = b.device_id and b.power_main_equ_flag = "no"
                  left join basedata_device c on b.parent_id = c.device_id
                  left join basedata_area d on c.area_id = d.area_id and d.area_type = 'bayunit'