质检附件上传排序

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -4413,7 +4413,7 @@ public class ExcelTabController extends BladeController {
     @NoArgsConstructor
     public static class BussfileDTO{
         private String name;
-        private String pdfUrl;
+        private String url;
     }
     @PostMapping("/previewBussfile")
     public R<List<BussfileDTO>> previewBussfile(@RequestPart("files")MultipartFile[] files){
@@ -4426,19 +4426,19 @@ public class ExcelTabController extends BladeController {
             NewBladeFile newBladeFile = new NewBladeFile();
             if (fileExtension.contains("xlsx")) {
                 newBladeFile = this.commonFileClient.excelToPdf(files[i]);
-                dto.setPdfUrl(newBladeFile.getPdfUrl());
+                dto.setUrl(newBladeFile.getPdfUrl());
             } else if (fileExtension.contains("xls")) {
                 newBladeFile = this.commonFileClient.excelToPdf(files[i]);
-                dto.setPdfUrl(newBladeFile.getPdfUrl());
+                dto.setUrl(newBladeFile.getPdfUrl());
             } else if (fileExtension.contains("docx")) {
                 newBladeFile = this.commonFileClient.wordToPdf(files[i]);
-                dto.setPdfUrl(newBladeFile.getPdfUrl());
+                dto.setUrl(newBladeFile.getPdfUrl());
             } else if (fileExtension.contains("png") || fileExtension.contains("jpg") || fileExtension.contains("webp") || fileExtension.contains("apng") ||
                     fileExtension.contains("bmp") || fileExtension.contains("jepg") || fileExtension.contains("tif") || fileExtension.contains("gif")) {
                 newBladeFile = this.commonFileClient.pngOrJpgToPdf(files[i]);
-                dto.setPdfUrl(newBladeFile.getPdfUrl());
+                dto.setUrl(newBladeFile.getPdfUrl());
             } else if (fileExtension.contains("pdf")) {
-                dto.setPdfUrl(bladeFile1.getLink());
+                dto.setUrl(bladeFile1.getLink());
             }
             dto.setName(files[i].getOriginalFilename());
             list.add(dto);
@@ -4582,8 +4582,9 @@ public class ExcelTabController extends BladeController {
                     }
                 }
             }
+            return R.status(tableFileService.updateBatchById(tableFileList));
        }
-       return R.status(tableFileService.updateBatchById(tableFileList));
+       return R.status(true);
     }