新增 归档压缩包

ruoyi-system/src/main/java/com/ruoyi/system/mapper/WaitRemindMapper.java

@@ -52,6 +52,7 @@ public interface WaitRemindMapper
      * @return 结果
      */
     public int deleteWaitRemindByRemindId(Integer remindId);
+    public int deleteWaitRemindByReadUserId(WaitRemind waitRemind);
 
     /**
      * 批量删除待办提醒

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

@@ -351,6 +351,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         String auditScheduleOld = loanApplication.getAuditSchedule();
         String auditTypeOld = loanApplication.getAuditType();
         String loanApplicationType = loanApplication.getLoanApplicationType();
+        String enterpriseName = loanApplication.getEnterpriseName();
         //判断是否已归档
         if (loanApplication.getLoanApplicationType().equals(FOR)) {
             return AjaxResult.error("当前项目已归档");
@@ -405,15 +406,24 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             loanApplication.setAuditType(FOR);
             loanApplication.setAuditSchedule(TWO);
             loanApplicationMapper.updateLoanApplication(loanApplication);
+            //给A角色发送待办提醒
+            WaitRemind waitRemind = new WaitRemind();
+            waitRemind.setLoanApplicationId(loanApplicationId);
+            waitRemind.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+            waitRemind.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息待办");
+            waitRemind.setRemindTime(DateUtils.getNowDate());
+            waitRemind.setRemindType(TWO);
+            waitRemind.setReadUserId(loanApplication.getaUserId().toString());
+            waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
+            waitRemindMapper.insertWaitRemind(waitRemind);
             return AjaxResult.success();
         }
         //通过,进入到下一个步骤
         if (TWO.equals(auditType)) {
-            String enterpriseName = loanApplication.getEnterpriseName();
             WaitRemind waitRemind = new WaitRemind();
             waitRemind.setLoanApplicationId(loanApplicationId);
             waitRemind.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
-            waitRemind.setRemindTitle("您有一条【"+enterpriseName +"】的审核信息待办");
+            waitRemind.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息待办");
             waitRemind.setRemindTime(DateUtils.getNowDate());
             waitRemind.setRemindType(TWO);
             if (auditSchedule.equals(ONE)) {
@@ -441,6 +451,18 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                     waitRemind.setReadUserId(loanApplication.getbUserId().toString());
                     waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
                     waitRemindMapper.insertWaitRemind(waitRemind);
+                    //删除A角色待办提醒
+                    WaitRemind waitRemindA = new WaitRemind();
+                    waitRemindA.setLoanApplicationId(loanApplicationId);
+                    waitRemindA.setReadUserId(loanApplication.getaUserId().toString());
+                    waitRemindMapper.deleteWaitRemindByReadUserId(waitRemindA);
+                }
+                if (auditSchedule.equals(THR)) {
+                    //删除B角色待办提醒
+                    WaitRemind waitRemindA = new WaitRemind();
+                    waitRemindA.setLoanApplicationId(loanApplicationId);
+                    waitRemindA.setReadUserId(loanApplication.getbUserId().toString());
+                    waitRemindMapper.deleteWaitRemindByReadUserId(waitRemindA);
                 }
                 //审核流程结束
             } else if (auditSchedule.equals(SEV)) {
@@ -530,6 +552,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         String loanApplicationType = loanApplication.getLoanApplicationType();
         String auditType = loanApplication.getAuditType();
 
+        LoanApplication loanApplicationOld = loanApplicationMapper.selectLoanApplicationByLoanApplicationId(loanApplicationId);
         reviewCommentsMapper.deleteReviewCommentsByLoanApplicationIdAndAuditSchedule(loanApplicationId, auditSchedule);
         if (Integer.parseInt(loanSchedule) < 2 || Integer.parseInt(auditSchedule) < 1 || Integer.parseInt(loanApplicationType) != 2) {
             return AjaxResult.error("当前项目不可撤销");
@@ -558,6 +581,33 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             }
             //还需要删除附件
             loanApplicationFjMapper.deleteLoanApplicationFjByLoanApplicationIdAndType(loanApplication.getLoanApplicationId(), type.split(","));
+            String enterpriseName = loanApplicationOld.getEnterpriseName();
+            String loanApplicationNumber = loanApplicationOld.getLoanApplicationNumber();
+            //如果退到 A角色审核 B角色审核 还需要插入待审核
+            if (loanApplication.getAuditSchedule().equals(TWO)){
+                WaitRemind waitRemind = new WaitRemind();
+                waitRemind.setLoanApplicationId(loanApplicationId);
+                waitRemind.setLoanApplicationNumber(loanApplicationNumber);
+                waitRemind.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息待办");
+                waitRemind.setRemindTime(DateUtils.getNowDate());
+                waitRemind.setRemindType(TWO);
+                //给A角色发送待办提醒
+                waitRemind.setReadUserId(loanApplicationOld.getaUserId().toString());
+                waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
+                waitRemindMapper.insertWaitRemind(waitRemind);
+            }
+            if (loanApplication.getAuditSchedule().equals(THR)){
+                WaitRemind waitRemind = new WaitRemind();
+                waitRemind.setLoanApplicationId(loanApplicationId);
+                waitRemind.setLoanApplicationNumber(loanApplicationNumber);
+                waitRemind.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息待办");
+                waitRemind.setRemindTime(DateUtils.getNowDate());
+                waitRemind.setRemindType(TWO);
+                //给B角色发送待办提醒
+                waitRemind.setReadUserId(loanApplicationOld.getbUserId().toString());
+                waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
+                waitRemindMapper.insertWaitRemind(waitRemind);
+            }
         }
         loanApplicationMapper.updateLoanApplication(loanApplication);
         return AjaxResult.success();
@@ -731,7 +781,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         }
         String loanApplicationNumber = loanApplication.getLoanApplicationNumber();
         Map<String, Object> params = new HashMap<>();
-        String path = "/profile/mb/temporarily/"+ loanApplicationNumber;
+        String path = "/profile/mb/temporarily/" + loanApplicationNumber;
         //查询公司信息
         SysUserEnterprise sysUserEnterprise = sysUserEnterpriseMapper.selectSysUserEnterpriseByEnterpriseId(loanApplication.getEnterpriseId());
         params.put("loanApplication", loanApplication);

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

@@ -114,4 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{remindId}
         </foreach>
     </delete>
+    <delete id="deleteWaitRemindByReadUserId" parameterType="WaitRemind">
+        delete from wait_remind where loan_application_id = #{loanApplicationId} and read_user_id = #{readUserId}
+    </delete>
 </mapper>