Эх сурвалжийг харах

修复暂存,修改删除所有附件问题,新增删除服务器内文件pdf,新增pdf压缩

Administrator 11 сар өмнө
parent
commit
581ce175a8

+ 8 - 8
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/LoanApplicationServiceImpl.java

@@ -963,7 +963,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 //等于6:评审会撤销
                 if (SIX.equals(loanSchedule) && !ONE.equals(reviewSchedule)) {
                     loanApplication.setReviewSchedule(ONE);
-                    if (FOR.equals(reviewSchedule)) {
+                    if (Integer.parseInt(reviewSchedule) >  3) {
                         //撤销到确认上会
                         loanApplication.setReviewSchedule(THR);
                         loanApplication.setReviewTime("");
@@ -973,13 +973,13 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 } else {
                     loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) - 1));
                     loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(loanSchedule) - 1));
-                }
-                //撤销完成后是到上会评审=评审会进度到 3:同意上会
-                if (SIX.equals(loanApplication.getLoanSchedule())) {
-                    loanApplication.setReviewSchedule(THR);
-                    loanApplication.setReviewTime("");
-                    //删掉参会人员
-                    sysUserConferenceMapper.deleteSysUserConferenceByTime(loanApplicationOld.getReviewTime(), loanApplicationOld.getLoanApplicationId());
+                    //撤销完成后是到上会评审=评审会进度到 3:同意上会
+                    if (SIX.equals(loanApplication.getLoanSchedule())) {
+                        loanApplication.setReviewSchedule(THR);
+                        loanApplication.setReviewTime("");
+                        //删掉参会人员
+                        sysUserConferenceMapper.deleteSysUserConferenceByTime(loanApplicationOld.getReviewTime(), loanApplicationOld.getLoanApplicationId());
+                    }
                 }
             } else {
                 //进入待审核