新增 归档压缩包

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

@@ -28,20 +28,20 @@ import com.ruoyi.system.service.loan.ILoanApplicationService;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.io.*;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.io.File;
-import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
+
 import static com.ruoyi.common.constant.CommonConstants.*;
+
 import javax.annotation.Resource;
 
 /**
@@ -530,29 +530,37 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         String auditSchedule = loanApplication.getAuditSchedule();
         String loanApplicationType = loanApplication.getLoanApplicationType();
         String auditType = loanApplication.getAuditType();
+
         reviewCommentsMapper.deleteReviewCommentsByLoanApplicationIdAndAuditSchedule(loanApplicationId, auditSchedule);
         if (Integer.parseInt(loanSchedule) < 2 || Integer.parseInt(auditSchedule) < 1 || Integer.parseInt(loanApplicationType) != 2) {
             return AjaxResult.error("当前项目不可撤销");
         }
-        //如果是待审核的撤销就退一步否则就是改为待审核
-        if (ONE.equals(auditType)) {
-            loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) - 1));
-            loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(loanSchedule) - 1));
+        if (Integer.parseInt(loanSchedule) > 7) {
+            //撤销只返回贷款申请进度到上一步
+            loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(auditSchedule) - 1));
+        } else {
+            //如果是待审核的撤销就退一步否则就是改为待审核
+            if (ONE.equals(auditType)) {
+                loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) - 1));
+                loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(loanSchedule) - 1));
+            }
+            if (SEV.equals(loanSchedule)) {
+                loanApplication.setLoanSchedule(SIX);
+            }
+            //进入待审核
+            loanApplication.setAuditType(ONE);
+            String type = "-1";
+            if (auditSchedule.equals(FIV)) {
+                type = "jzdcbg";
+            } else if (auditSchedule.equals(SIX)) {
+                type = "dbxmhfhgb,clhgb";
+            } else if (auditSchedule.equals(SEV)) {
+                type = "psyjqpb,gdhyjy";
+            }
+            //还需要删除附件
+            loanApplicationFjMapper.deleteLoanApplicationFjByLoanApplicationIdAndType(loanApplication.getLoanApplicationId(), type.split(","));
         }
-        //进入待审核
-        loanApplication.setAuditType(ONE);
         loanApplicationMapper.updateLoanApplication(loanApplication);
-        String type = "-1";
-        if (auditSchedule.equals(FIV)) {
-            type = "jzdcbg";
-        } else if (auditSchedule.equals(SIX)) {
-            type = "dbxmhfhgb,clhgb";
-        } else if (auditSchedule.equals(SEV)) {
-            type = "psyjqpb,gdhyjy";
-        }
-        //还需要删除附件
-        loanApplicationFjMapper.deleteLoanApplicationFjByLoanApplicationIdAndType(loanApplication.getLoanApplicationId(), type.split(","));
-
         return AjaxResult.success();
     }
 
@@ -583,7 +591,6 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         loanScheduleNew.setLoanScheduleTime(DateUtils.getNowDate());
         loanScheduleNew.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
         loanScheduleMapper.insertLoanSchedule(loanScheduleNew);
-        //todo 获取所有文件URL 进行打包zip,还有系统内的照片地址 往附件表中插入其他-归档类型的url地址
         // 上传文件路径
         String filePath = RuoYiConfig.getUploadPath() + "/";
         Long loanApplicationId = loanApplication.getLoanApplicationId();
@@ -641,7 +648,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         loanApplicationFj.setLoanApplicationNumber(loanApplicationOld.getLoanApplicationNumber());
         loanApplicationFj.setOldName(name);
         loanApplicationFj.setName(name);
-        loanApplicationFj.setUrl("/profile/upload/"+name);
+        loanApplicationFj.setUrl("/profile/upload/" + name);
         loanApplicationFj.setBigType("e");
         loanApplicationFj.setCreateTime(DateUtils.getNowDate());
         loanApplicationFjMapper.insertLoanApplicationFj(loanApplicationFj);
@@ -659,7 +666,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
      * @return
      */
     public String zipEncryptExample(List<File> fileList, String zipPathDir, String zipFileName, String password) {
-        String zipFilePath = zipPathDir +"/"+ zipFileName;
+        String zipFilePath = zipPathDir + "/" + zipFileName;
         try {
 
 /*            ZipParameters zipParameters = new ZipParameters();
@@ -704,10 +711,10 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
      */
     @Override
     public AjaxResult exportMb(LoanApplication loanApplication) {
-        Map<String,Object> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         String type = loanApplication.getType();
         String loanApplicationNumber = loanApplication.getLoanApplicationNumber();
-        if(loanApplication.getLoanApplicationId()!=null || loanApplication.getLoanApplicationId()!=0L){
+        if (loanApplication.getLoanApplicationId() != null || loanApplication.getLoanApplicationId() != 0L) {
             loanApplication = loanApplicationMapper.selectLoanApplicationByLoanApplicationId(loanApplication.getLoanApplicationId());
             loanApplication.setType(type);
             //判断附件存不存在
@@ -717,12 +724,12 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             String fileType = contrastType(type);
             loanApplicationFj.setType(fileType);
             List<LoanApplicationFj> loanApplicationFjs = loanApplicationFjMapper.selectLoanApplicationFjList(loanApplicationFj);
-            if(loanApplicationFjs!=null && loanApplicationFjs.size()>0){
+            if (loanApplicationFjs != null && loanApplicationFjs.size() > 0) {
                 for (LoanApplicationFj applicationFj : loanApplicationFjs) {
-                    redisCache.setCacheObject(applicationFj.getFjId()+"info",applicationFj,2, TimeUnit.HOURS);
-                    map.put("fileId",applicationFj.getFjId());
-                    map.put("path",applicationFj.getUrl());
-                    map.put("fileName",applicationFj.getName());
+                    redisCache.setCacheObject(applicationFj.getFjId() + "info", applicationFj, 2, TimeUnit.HOURS);
+                    map.put("fileId", applicationFj.getFjId());
+                    map.put("path", applicationFj.getUrl());
+                    map.put("fileName", applicationFj.getName());
                     return AjaxResult.success(map);
                 }
             }
@@ -744,7 +751,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 //params.put("enterpriseName", loanApplication.getEnterpriseName());
                 //path = path + "/委托担保申请书.doc";
                 templatePath = RuoYiConfig.getProfile() + "/mb/委托担保申请书.docx";
-                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily"+loanApplicationNumber;
+                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily" + loanApplicationNumber;
                 //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("委托担保申请书");
                 fileName = loanApplication.getEnterpriseName() + "-委托担保申请书";
                 fileNameHz = fileName + ".docx";
@@ -756,7 +763,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 params.put("corporationPhone", loanApplication.getCorporationPhone());
                 //path = path + "/委托担保申请书.doc";
                 templatePath = RuoYiConfig.getProfile() + "/mb/委托保证合同.docx";
-                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily"+loanApplicationNumber;
+                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily" + loanApplicationNumber;
                 //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("委托担保申请书");
                 fileName = loanApplication.getEnterpriseName() + "-委托担保申请书";
                 fileNameHz = fileName + ".docx";
@@ -767,7 +774,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 //params.put("enterpriseName", loanApplication.getEnterpriseName());
                 //path = path + "/委托担保申请书.doc";
                 templatePath = templatePath + "/mb/担保意向函.docx";
-                fileDir = fileDir + "/mb/temporarily"+loanApplicationNumber;
+                fileDir = fileDir + "/mb/temporarily" + loanApplicationNumber;
                 //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("担保意向函");
                 fileName = loanApplication.getEnterpriseName() + "-担保意向函";
                 fileNameHz = fileName + ".docx";
@@ -778,7 +785,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 //params.put("enterpriseName", loanApplication.getEnterpriseName());
                 //path = path + "/委托担保申请书.doc";
                 templatePath = RuoYiConfig.getProfile() + "/mb/放款（出票）通知书.docx";
-                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily/"+loanApplicationNumber;
+                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily/" + loanApplicationNumber;
                 //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("放款（出票）通知书");
                 fileName = loanApplication.getEnterpriseName() + "-放款（出票）通知书";
                 fileNameHz = fileName + ".docx";
@@ -789,7 +796,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 //params.put("enterpriseName", loanApplication.getEnterpriseName());
                 //path = path + "/委托担保申请书.doc";
                 templatePath = RuoYiConfig.getProfile() + "/mb/保证反担保合同（适用于法人).docx";
-                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily"+loanApplicationNumber;
+                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily" + loanApplicationNumber;
                 //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("保证反担保合同（适用于法人)");
                 fileName = loanApplication.getEnterpriseName() + "-保证反担保合同（适用于法人)";
                 fileNameHz = fileName + ".docx";
@@ -800,7 +807,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 //params.put("enterpriseName", loanApplication.getEnterpriseName());
                 //path = path + "/委托担保申请书.doc";
                 templatePath = RuoYiConfig.getProfile() + "/mb/保证反担保合同（适用于自然人）.docx";
-                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily"+loanApplicationNumber;
+                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily" + loanApplicationNumber;
                 //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("保证反担保合同（适用于自然人）");
                 fileName = loanApplication.getEnterpriseName() + "-保证反担保合同（适用于自然人）";
                 fileNameHz = fileName + ".docx";
@@ -811,7 +818,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 //params.put("enterpriseName", loanApplication.getEnterpriseName());
                 //path = path + "/委托担保申请书.doc";
                 templatePath = RuoYiConfig.getProfile() + "/mb/抵押反担保合同（适用于法人）.docx";
-                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily"+loanApplicationNumber;
+                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily" + loanApplicationNumber;
                 //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("抵押反担保合同（适用于法人）");
                 fileName = loanApplication.getEnterpriseName() + "-抵押反担保合同（适用于法人）";
                 fileNameHz = fileName + ".docx";
@@ -822,7 +829,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 //params.put("enterpriseName", loanApplication.getEnterpriseName());
                 //path = path + "/委托担保申请书.doc";
                 templatePath = RuoYiConfig.getProfile() + "/mb/抵押反担保合同（适用于自然人）.docx";
-                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily"+loanApplicationNumber;
+                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily" + loanApplicationNumber;
                 //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("抵押反担保合同（适用于自然人）");
                 fileName = loanApplication.getEnterpriseName() + "-抵押反担保合同（适用于自然人）";
                 fileNameHz = fileName + ".docx";
@@ -833,7 +840,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 //params.put("enterpriseName", loanApplication.getEnterpriseName());
                 //path = path + "/委托担保申请书.doc";
                 templatePath = RuoYiConfig.getProfile() + "/mb/权利质权反担保合同（适用于法人）.docx";
-                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily"+loanApplicationNumber;
+                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily" + loanApplicationNumber;
                 //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("权利质权反担保合同（适用于法人）");
                 fileName = loanApplication.getEnterpriseName() + "-权利质权反担保合同（适用于法人）";
                 fileNameHz = fileName + ".docx";
@@ -844,7 +851,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 //params.put("enterpriseName", loanApplication.getEnterpriseName());
                 //path = path + "/委托担保申请书.doc";
                 templatePath = RuoYiConfig.getProfile() + "/mb/权利质权反担保合同（适用于自然人）.docx";
-                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily"+loanApplicationNumber;
+                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily" + loanApplicationNumber;
                 //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("权利质权反担保合同（适用于自然人）");
                 fileName = loanApplication.getEnterpriseName() + "-权利质权反担保合同（适用于自然人）";
                 fileNameHz = fileName + ".docx";
@@ -855,7 +862,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 //params.put("enterpriseName", loanApplication.getEnterpriseName());
                 //path = path + "/委托担保申请书.doc";
                 templatePath = RuoYiConfig.getProfile() + "/mb/股东会决议.docx";
-                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily"+loanApplicationNumber;
+                fileDir = RuoYiConfig.getProfile() + "/mb/temporarily" + loanApplicationNumber;
                 //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("股东会决议");
                 fileName = loanApplication.getEnterpriseName() + "-股东会决议";
                 fileNameHz = fileName + ".docx";
@@ -865,19 +872,19 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             case "12":
 
                 // 创建一个列表，用来存储要填充到Excel中的数据
-                List<Map<String,Object>> list = new ArrayList<>();
+                List<Map<String, Object>> list = new ArrayList<>();
                 // 向列表中添加数据
-                list.add( Map.of("name","zou" ,"age" ,18) );
+/*                list.add( Map.of("name","zou" ,"age" ,18) );
                 list.add( Map.of("name","li" ,"age" ,28) );
                 list.add( Map.of("name","wang" ,"age" ,15) );
                 list.add( Map.of("name","quan" ,"age" ,19) );
-                list.add( Map.of("name","zhao" ,"age" ,98) );
+                list.add( Map.of("name","zhao" ,"age" ,98) );*/
 
                 //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("项目评审意见签批表");
                 fileName = loanApplication.getEnterpriseName() + "-项目评审意见签批表";
                 fileNameHz = fileName + ".xlsx";
                 templatePath = RuoYiConfig.getProfile() + "/mb/项目评审意见签批表.xlsx";
-                ExcelFillUtils.fillOneSheet(templatePath ,fileName ,list);
+                ExcelFillUtils.fillOneSheet(templatePath, fileName, list);
 
                 //templatePath = RuoYiConfig.getProfile() + "/mb/项目评审意见签批表.docx";
                 //fileDir = RuoYiConfig.getProfile() + "/mb/temporarily";
@@ -892,7 +899,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 fileDir = RuoYiConfig.getProfile() + "/mb/temporarily";
                 //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("担保项目合法合规表企业");
                 fileName = loanApplication.getEnterpriseName() + "-担保项目合法合规表企业";
-                if("2".equals(loanApplication.getApplicationType())){
+                if ("2".equals(loanApplication.getApplicationType())) {
                     templatePath = RuoYiConfig.getProfile() + "/mb/担保项目合法合规表个人个体户.docx";
                     fileDir = RuoYiConfig.getProfile() + "/mb/temporarily";
                     //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("担保项目合法合规表个人个体户");
@@ -908,7 +915,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 fileDir = RuoYiConfig.getProfile() + "/mb/temporarily";
                 //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("放款审批合规表企业");
                 fileName = loanApplication.getEnterpriseName() + "-放款审批合规表企业";
-                if("2".equals(loanApplication.getApplicationType())){
+                if ("2".equals(loanApplication.getApplicationType())) {
                     templatePath = RuoYiConfig.getProfile() + "/mb/放款审批合规表个人个体户.docx";
                     fileDir = RuoYiConfig.getProfile() + "/mb/temporarily";
                     //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("放款审批合规表个人个体户");
@@ -927,11 +934,11 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         applicationFj.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
         applicationFj.setName(fileName);
         String fileId = IdUtils.fastSimpleUUID();
-        redisCache.setCacheObject(fileId +"info",applicationFj,2, TimeUnit.HOURS);
+        redisCache.setCacheObject(fileId + "info", applicationFj, 2, TimeUnit.HOURS);
 
-        map.put("fileId",fileId);
-        map.put("path",path);
-        map.put("fileName",fileNameHz);
+        map.put("fileId", fileId);
+        map.put("path", path);
+        map.put("fileName", fileNameHz);
         return AjaxResult.success(map);
     }