Merge remote-tracking branch 'origin/master'

ruoyi-system/src/main/java/com/ruoyi/system/service/loan/impl/LoanApplicationServiceImpl.java

@@ -640,15 +640,17 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
 
         String name = StringUtils.format("{}_{}.{}",
                 loanApplicationOld.getEnterpriseName(), Seq.getId(Seq.uploadSeqType) + "文档", "zip");
+        String zipFileName = StringUtils.format("{}/{}_{}.{}",loanApplicationOld.getLoanApplicationNumber(),
+                loanApplicationOld.getEnterpriseName(), Seq.getId(Seq.uploadSeqType) + "文档", "zip");
         //进行压缩
-        zipEncryptExample(fileList, filePath + loanApplicationOld.getLoanApplicationNumber(), name, "123");
+        zipEncryptExample(fileList, filePath, zipFileName, "123");
         //把压缩包的url插入附件表
         LoanApplicationFj loanApplicationFj = new LoanApplicationFj();
         loanApplicationFj.setLoanApplicationId(loanApplicationId);
         loanApplicationFj.setLoanApplicationNumber(loanApplicationOld.getLoanApplicationNumber());
         loanApplicationFj.setOldName(name);
         loanApplicationFj.setName(name);
-        loanApplicationFj.setUrl("/profile/upload/" + name);
+        loanApplicationFj.setUrl("/profile/upload/" + loanApplicationOld.getLoanApplicationNumber() + "/" + name);
         loanApplicationFj.setBigType("e");
         loanApplicationFj.setCreateTime(DateUtils.getNowDate());
         loanApplicationFjMapper.insertLoanApplicationFj(loanApplicationFj);
@@ -665,7 +667,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
      * @param password    加密密码
      * @return
      */
-    public String zipEncryptExample(List<File> fileList, String zipPathDir, String zipFileName, String password) {
+    public void zipEncryptExample(List<File> fileList, String zipPathDir, String zipFileName, String password) {
         String zipFilePath = zipPathDir + "/" + zipFileName;
         try {
 
@@ -703,7 +705,6 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return zipFilePath;
     }
 
     /**