浏览代码

feat(文件):文件上传修改

liutao 7 月之前
父节点
当前提交
3b284e1895

+ 1 - 1
build.gradle

@@ -9,7 +9,7 @@ targetCompatibility = 1.8
 
 jar {
     baseName = 'factoring-trade-prod'
-    version = '1.0.20'
+    version = '1.0.21'
 }
 
 springBoot {

+ 5 - 5
src/main/java/com/sunxung/factoring/service/underlying/impl/UnderlyingBasicInfoServiceImpl.java

@@ -169,11 +169,11 @@ public class UnderlyingBasicInfoServiceImpl extends ServiceImpl<UnderlyingBasicI
                                                 InvoiceApproval invoiceApproval = invoiceApprovalService
                                                         .getOne(new QueryWrapper<InvoiceApproval>().eq("invoice_basic_info_id", m)
                                                                 .eq("approval_conclusion","pass"));
-                                                if (invoiceApproval != null) {
-                                                    InvoiceApproval invoiceApprovalData = invoiceApprovalService.getView(invoiceApproval.getId());
-                                                    fileStorageList.addAll(invoiceApprovalData.getSettlementFile());
-                                                    fileStorageList.addAll(invoiceApprovalData.getSettlementUpstreamSignedFile());
-                                                }
+//                                                if (invoiceApproval != null) {
+//                                                    InvoiceApproval invoiceApprovalData = invoiceApprovalService.getView(invoiceApproval.getId());
+//                                                    fileStorageList.addAll(invoiceApprovalData.getSettlementFile());
+//                                                    fileStorageList.addAll(invoiceApprovalData.getSettlementUpstreamSignedFile());
+//                                                }
                                             }
                                     );
                                 }

+ 3 - 0
src/main/java/com/sunxung/factoring/web/sys/FileStorageController.java

@@ -195,6 +195,9 @@ public class FileStorageController {
     @ResponseBody
     public ResponseJson doUploadFiles(HttpServletRequest req, String mouldName) {
         List<FileStorage> fileStorages = new ArrayList<>();
+        if(StringUtil.isEmpty(mouldName)){
+            mouldName = "upload";
+        }
         try {
             fileStorages = fileStorageService.doUploadFiles(req, mouldName);
         } catch (Exception e) {