Merge branch 'develop' of gitadmin/tuoheng_telecomumale into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/workorder/generate/GenerateWorkorderByAutoService.java

@@ -56,13 +56,13 @@ public class GenerateWorkorderByAutoService {
     public JsonResult generate(Inspection inspection, List<InspectionFile> inspectionFileList) {
         log.info("进入自动生成工单业务");
 
-        List<String> inspectionIdList = inspectionFileList.stream().map(o -> o.getInspectionId()).collect(Collectors.toList());
+        List<String> inspectionFileIdList = inspectionFileList.stream().map(o -> o.getId()).collect(Collectors.toList());
 
         WorkOrder workOrder = this.insertWorkOrder(inspection);
 
-        this.insertWorkOrderFile(workOrder, inspectionIdList);
+        this.insertWorkOrderFile(workOrder, inspectionFileIdList);
 
-        this.updateInspectionFileStatus(inspectionIdList);
+        this.updateInspectionFileStatus(inspectionFileIdList);
 
         return JsonResult.success();
     }