新增 全局审核意见，每步操作都有记录

ruoyi-admin/src/main/java/com/ruoyi/web/controller/loan/LoanApplicationController.java

@@ -124,7 +124,7 @@ public class LoanApplicationController extends BaseController {
     }
 
     /**
-     * 7：合同签约 8：放款合规风险审核 9：放款通知 进度条
+     * 7：合同签约 8：放款合规风险审核
      */
     @PreAuthorize("@ss.hasPermi('system:application:schedule')")
     @PostMapping("/schedule")

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

@@ -772,7 +772,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         }
         LoanApplication application = new LoanApplication();
         application.setLoanApplicationId(loanApplication.getLoanApplicationId());
-        application.setAuditType(ONE);
+        application.setAuditType(TWO);
         if (SEV.equals(loanSchedule)) {
             application.setLoanSchedule(EIG);
             application.setAuditSchedule(NIN);
@@ -844,22 +844,31 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         List<WaitRemind> waitRemindList = new ArrayList<>();
 
         LoanApplication loanApplicationOld = loanApplicationMapper.selectLoanApplicationByLoanApplicationId(loanApplicationId);
-        reviewCommentsMapper.deleteReviewCommentsByLoanApplicationIdAndAuditSchedule(loanApplicationId, auditSchedule);
+        //reviewCommentsMapper.deleteReviewCommentsByLoanApplicationIdAndAuditSchedule(loanApplicationId, auditSchedule);
         if (Integer.parseInt(loanSchedule) < 2 || Integer.parseInt(auditSchedule) < 1 || Integer.parseInt(loanApplicationType) != 2) {
             return AjaxResult.error("当前项目不可撤销");
         }
         if (Integer.parseInt(loanSchedule) > 7) {
             //撤销只返回贷款申请进度到上一步
             loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(loanSchedule) - 1));
+            loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) - 1));
         } else {
             //如果是待审核的撤销就退一步否则就是改为待审核
-            if (ONE.equals(auditType)) {
+            if (ONE.equals(auditType) ) {
                 loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) - 1));
                 loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(loanSchedule) - 1));
+                //等于6：评审会撤销
+                if (SIX.equals(loanSchedule)) {
+                    loanApplication.setReviewSchedule(ONE);
+                    String reviewSchedule = loanApplication.getReviewSchedule();
+                    if (FOR.equals(reviewSchedule)){
+                        //撤销到确认上会
+                        loanApplication.setReviewSchedule(THR);
+                        loanApplication.setReviewTime("");
+                    }
+                }
             }
-            if (SEV.equals(loanSchedule)) {
-                loanApplication.setLoanSchedule(SIX);
-            }
+
             //进入待审核
             loanApplication.setAuditType(ONE);
             String type = "-1";

ruoyi-system/src/main/resources/mapper/system/LoanApplicationMapper.xml

@@ -226,7 +226,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="auditSchedule != null and auditSchedule != ''">audit_schedule,</if>
             <if test="auditType != null and auditType != ''">audit_type,</if>
             <if test="loanApplicationType != null and loanApplicationType != ''">loan_application_type,</if>
-            <if test="reviewSchedule != null and reviewSchedule != ''">reviewSchedule,</if>
+            <if test="reviewSchedule != null and reviewSchedule != ''">review_schedule,</if>
             <if test="aUserId != null">a_user_id,</if>
             <if test="aUserName != null">a_user_name,</if>
             <if test="aAuthorize != null and aAuthorize != ''">a_authorize,</if>