fix 待办流程提醒

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

@@ -271,7 +271,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
      * @return 结果
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public int insertLoanApplication(LoanApplication loanApplication) {
         if (loanApplicationMapper.selectLoanApplicationList(loanApplication).size() > 0) {
             return 0;
@@ -326,6 +326,45 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         loanSchedule.setLoanScheduleScore(0L);
         loanSchedule.setLoanScheduleTime(DateUtils.getNowDate());
         loanScheduleMapper.insertLoanSchedule(loanSchedule);
+
+        //查询审核管理员用户id
+        List<SysUserRole> sysUserRoles = sysUserRoleMapper.selectRoleListNoDataScope();
+        List<Long> userIdList = new ArrayList<>();
+        //待办信息集合
+        List<WaitRemind> waitRemindList = new ArrayList<>();
+        if (sysUserRoles != null && sysUserRoles.size() > 0) {
+            userIdList = sysUserRoles.stream().map(SysUserRole::getUserId).collect(Collectors.toList());
+            for (SysUserRole sysUserRole : sysUserRoles) {
+                WaitRemind waitRemindManager = new WaitRemind();
+                waitRemindManager.setLoanApplicationId(loanApplication.getLoanApplicationId());
+                waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+                waitRemindManager.setRemindTitle("有一条【" + loanApplication.getEnterpriseName() + "】贷款申请需及时处理");
+                waitRemindManager.setRemindTime(DateUtils.getNowDate());
+                waitRemindManager.setRemindType(ONE);
+                waitRemindManager.setRemindContent(loanApplication.getEnterpriseName() + "有一条贷款申请进需及时处理");
+                //给管理员发送待办提醒
+                waitRemindManager.setReadUserId(sysUserRole.getUserId().toString());
+                waitRemindList.add(waitRemindManager);
+            }
+        }
+        //插入审核通过的待办提醒
+        if (waitRemindList.size() > 0) {
+            waitRemindMapper.batchWaitRemind(waitRemindList);
+            //发极光推送id
+            List<SysUser> sysUsers = sysUserService.selectUserListByIdList(userIdList);
+            if (sysUsers != null && sysUsers.size() > 0) {
+                String notificationTitle = "消息通知";
+                String msgTitle = "审核信息";
+                String msgContent = loanApplication.getEnterpriseName() + "的审核信息申请通过进入到下一阶段";
+                String jPushVO = "";
+                List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+                listS.removeAll(Collections.singleton(null));
+                if (listS != null && listS.size() > 0) {
+                    String[] registrationId = listS.toArray(new String[listS.size()]);
+                    JPushToolUtil.sendToRegistrationId(notificationTitle, msgTitle, msgContent, jPushVO, registrationId);
+                }
+            }
+        }
         return i;
     }
 
@@ -418,6 +457,44 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             guaranteeInfoFjMapper.deleteGuaranteeInfoFjByGuaranteeInfoIds(guaranteeInfoIdList);
         }
         int rows = loanApplicationMapper.updateLoanApplication(loanApplication);
+        //查询审核管理员用户id
+        List<SysUserRole> sysUserRoles = sysUserRoleMapper.selectRoleListNoDataScope();
+        List<Long> userIdList = new ArrayList<>();
+        //待办信息集合
+        List<WaitRemind> waitRemindList = new ArrayList<>();
+        if (sysUserRoles != null && sysUserRoles.size() > 0) {
+            userIdList = sysUserRoles.stream().map(SysUserRole::getUserId).collect(Collectors.toList());
+            for (SysUserRole sysUserRole : sysUserRoles) {
+                WaitRemind waitRemindManager = new WaitRemind();
+                waitRemindManager.setLoanApplicationId(loanApplication.getLoanApplicationId());
+                waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+                waitRemindManager.setRemindTitle("有一条【" + loanApplication.getEnterpriseName() + "】贷款申请需及时处理");
+                waitRemindManager.setRemindTime(DateUtils.getNowDate());
+                waitRemindManager.setRemindType(ONE);
+                waitRemindManager.setRemindContent(loanApplication.getEnterpriseName() + "有一条贷款申请需及时处理");
+                //给管理员发送待办提醒
+                waitRemindManager.setReadUserId(sysUserRole.getUserId().toString());
+                waitRemindList.add(waitRemindManager);
+            }
+        }
+        //插入审核通过的待办提醒
+        if (waitRemindList.size() > 0) {
+            waitRemindMapper.batchWaitRemind(waitRemindList);
+            //发极光推送id
+            List<SysUser> sysUsers = sysUserService.selectUserListByIdList(userIdList);
+            if (sysUsers != null && sysUsers.size() > 0) {
+                String notificationTitle = "消息通知";
+                String msgTitle = "审核信息";
+                String msgContent = loanApplication.getEnterpriseName() + "的审核信息申请通过进入到下一阶段";
+                String jPushVO = "";
+                List<String> listS = sysUsers.stream().map(SysUser::getJgId).collect(Collectors.toList());
+                listS.removeAll(Collections.singleton(null));
+                if (listS != null && listS.size() > 0) {
+                    String[] registrationId = listS.toArray(new String[listS.size()]);
+                    JPushToolUtil.sendToRegistrationId(notificationTitle, msgTitle, msgContent, jPushVO, registrationId);
+                }
+            }
+        }
         return rows > 0 ? AjaxResult.success() : AjaxResult.error();
     }
 
@@ -641,6 +718,10 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         if (Integer.parseInt(auditSchedule) <= Integer.parseInt(auditScheduleOld) && !Objects.equals(auditTypeOld, ONE)) {
             return AjaxResult.error("当前进度已审核，请勿重复审核");
         }
+        //删除所有待办信息
+        WaitRemind waitRemindDelete = new WaitRemind();
+        waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
+        waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
         List<LoanApplicationFj> fjUrl = reviewComments.getFjUrl();
         if (fjUrl != null && fjUrl.size() > 0) {
             StringBuilder type = new StringBuilder();
@@ -695,16 +776,13 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             }
             waitRemindMapper.batchWaitRemind(waitRemindList);*/
             return AjaxResult.success();
-            //A角色审核不通过 audit_schedule = 2的时候贷款申请进度处于担保初审状态
+            //A角色审核不通过 audit_schedule = 3的时候贷款申请进度处于担保初审状态
         } else if (THR.equals(auditType) && auditSchedule.equals(TWO)) {
             loanApplication.setLoanSchedule(THR);
             loanApplication.setAuditType(FOR);
             loanApplication.setLoanApplicationType(TWO);
             loanApplicationMapper.updateLoanApplication(loanApplication);
-            //删除所有待办信息
-            WaitRemind waitRemindDelete = new WaitRemind();
-            waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-            waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
+
             //给A角色，审核管理员发送待办
             WaitRemind waitRemind = new WaitRemind();
             waitRemind.setLoanApplicationId(loanApplicationId);
@@ -719,11 +797,6 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             if (sysUserRoles != null && sysUserRoles.size() > 0) {
                 userIdList = sysUserRoles.stream().map(SysUserRole::getUserId).collect(Collectors.toList());
                 for (SysUserRole sysUserRole : sysUserRoles) {
-                    //删除已处理的待办信息
-                    waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-                    waitRemindDelete.setReadUserId(sysUserRole.getUserId().toString());
-                    waitRemindDelete.setRemindType(TWO);
-                    waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
 
                     WaitRemind waitRemindManager = new WaitRemind();
                     waitRemindManager.setLoanApplicationId(loanApplicationId);
@@ -762,10 +835,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             //进入到A角色申诉状态保留当前项目状态，只把audit_type改为申诉
             loanApplication.setAuditType(FOR);
             loanApplicationMapper.updateLoanApplication(loanApplication);
-            //删除所有的待办信息
-            WaitRemind waitRemindDelete = new WaitRemind();
-            waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-            waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
+
             //给A角色发送待办提醒
             WaitRemind waitRemind = new WaitRemind();
             waitRemind.setLoanApplicationId(loanApplicationId);
@@ -816,7 +886,6 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         //通过,进入到下一个步骤
         if (TWO.equals(auditType)) {
 
-            WaitRemind waitRemindDelete = new WaitRemind();
             List<Long> userIdList = new ArrayList<>();
 
             WaitRemind waitRemind = new WaitRemind();
@@ -826,9 +895,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             waitRemind.setRemindTime(DateUtils.getNowDate());
             waitRemind.setRemindType(TWO);
             if (auditSchedule.equals(ONE)) {
-                //删除已处理的待办信息
-                waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-                waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
+
                 loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(loanScheduleOld) + 1));
                 loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) + 1));
                 loanApplication.setAuditType(ONE);
@@ -873,12 +940,6 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) + 1));
                 loanApplication.setAuditType(ONE);
                 if (auditSchedule.equals(TWO)) {
-                    //删除已处理的待办信息
-
-                    waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-                    waitRemindDelete.setReadUserId(loanApplication.getaUserId().toString());
-                    waitRemindDelete.setRemindType(TWO);
-                    waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
                     //给B角色发送待办提醒
                     waitRemind.setReadUserId(loanApplication.getbUserId().toString());
                     waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
@@ -889,11 +950,6 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                         userIdList = sysUserRoles.stream().map(SysUserRole::getUserId).collect(Collectors.toList());
 
                         for (SysUserRole sysUserRole : sysUserRoles) {
-                            //删除已处理的待办信息
-                            waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-                            waitRemindDelete.setReadUserId(sysUserRole.getUserId().toString());
-                            waitRemindDelete.setRemindType(TWO);
-                            waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
 
                             WaitRemind waitRemindManager = new WaitRemind();
                             waitRemindManager.setLoanApplicationId(loanApplicationId);
@@ -909,14 +965,8 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                         }
                     }
                     userIdList.add(loanApplication.getbUserId());
-                }
-                if (auditSchedule.equals(THR)) {
-                    //删除已处理的待办信息
+                } else if (auditSchedule.equals(THR)) {
 
-                    waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-                    waitRemindDelete.setReadUserId(loanApplication.getbUserId().toString());
-                    waitRemindDelete.setRemindType(THR);
-                    waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
                     //给风险角色发送待办提醒
                     waitRemind.setReadUserId(loanApplication.getfUserId().toString());
                     waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
@@ -925,15 +975,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                     if (sysUserRoles != null && sysUserRoles.size() > 0) {
                         //极光推送
                         userIdList = sysUserRoles.stream().map(SysUserRole::getUserId).collect(Collectors.toList());
-
-
                         for (SysUserRole sysUserRole : sysUserRoles) {
-                            //删除已处理的待办信息
-                            waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-                            waitRemindDelete.setReadUserId(sysUserRole.getUserId().toString());
-                            waitRemindDelete.setRemindType(THR);
-                            waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
-
                             WaitRemind waitRemindManager = new WaitRemind();
                             waitRemindManager.setLoanApplicationId(loanApplicationId);
                             waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
@@ -949,17 +991,26 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                     }
                     userIdList.add(loanApplication.getfUserId());
                 }
-                //审核流程结束
             } else {
+                //审核流程结束
                 loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(loanScheduleOld) + 1));
                 loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) + 1));
                 loanApplication.setAuditType(ONE);
-                //删除已处理的待办信息
 
-                waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-                waitRemindDelete.setReadUserId(loanApplication.getaUserId().toString());
-                waitRemindDelete.setRemindType(auditSchedule);
-                waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
+                if (auditSchedule.equals(FOR)){
+                    //给初审风险合规状态下的风险发送
+                    WaitRemind waitRemindf = new WaitRemind();
+                    waitRemindf.setLoanApplicationId(loanApplicationId);
+                    waitRemindf.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+                    waitRemindf.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息通过");
+                    waitRemindf.setRemindTime(DateUtils.getNowDate());
+                    //给风险角色发送待办提醒
+                    waitRemindf.setReadUserId(loanApplication.getfUserId().toString());
+                    waitRemindf.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
+                    waitRemindf.setRemindType(FIV);
+                    waitRemindList.add(waitRemindf);
+                    userIdList.add(loanApplication.getfUserId());
+                }
                 //给A角色发送待办提醒
                 waitRemind.setRemindType(loanApplication.getAuditSchedule());
                 waitRemind.setReadUserId(loanApplication.getaUserId().toString());
@@ -970,11 +1021,6 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                     userIdList = sysUserRoles.stream().map(SysUserRole::getUserId).collect(Collectors.toList());
 
                     for (SysUserRole sysUserRole : sysUserRoles) {
-                        //删除已处理的待办信息
-                        waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-                        waitRemindDelete.setReadUserId(sysUserRole.getUserId().toString());
-                        waitRemindDelete.setRemindType(auditSchedule);
-                        waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
                         WaitRemind waitRemindManager = new WaitRemind();
                         waitRemindManager.setLoanApplicationId(loanApplicationId);
                         waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
@@ -1126,10 +1172,8 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         //删除所有状态小于的待办事项
         WaitRemind waitRemindDelete = new WaitRemind();
         waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-        waitRemindDelete.setReadUserId(loanApplication.getaUserId().toString());
-        waitRemindDelete.setRemindType(SEV);
-        //删除所有状态值不等于的待办
-        waitRemindMapper.deleteWaitRemindByLoanApplicationIdAndRemindType(waitRemindDelete);
+        //删除所有待办
+        waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
         //给A角色发送上会审核信息
         WaitRemind waitRemindManager = new WaitRemind();
         waitRemindManager.setLoanApplicationId(loanApplication.getLoanApplicationId());
@@ -1189,9 +1233,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         //删除所有状态小于的待办事项
         WaitRemind waitRemindDelete = new WaitRemind();
         waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-        waitRemindDelete.setReadUserId(loanApplication.getaUserId().toString());
-        waitRemindDelete.setRemindType(application.getAuditSchedule());
-        waitRemindMapper.deleteWaitRemindByLoanApplicationIdAndRemindType(waitRemindDelete);
+        waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
         //给A角色发送待办提醒
         //待办信息集合
         //查询审核管理员用户id
@@ -1211,13 +1253,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             //极光推送
             userIdList = sysUserRoles.stream().map(SysUserRole::getUserId).collect(Collectors.toList());
 
-
             for (SysUserRole sysUserRole : sysUserRoles) {
-                //删除所有状态小于的待办事项
-                waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-                waitRemindDelete.setReadUserId(sysUserRole.getUserId().toString());
-                waitRemindDelete.setRemindType(application.getAuditSchedule());
-                waitRemindMapper.deleteWaitRemindByLoanApplicationIdAndRemindType(waitRemindDelete);
 
                 WaitRemind waitRemindManager = new WaitRemind();
                 waitRemindManager.setLoanApplicationId(loanApplication.getLoanApplicationId());
@@ -1342,43 +1378,49 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
 
         String enterpriseName = loanApplicationOld.getEnterpriseName();
         String loanApplicationNumber = loanApplicationOld.getLoanApplicationNumber();
-        //如果退到 A角色审核 B角色审核 还需要插入待办提醒
+        WaitRemind waitRemind = new WaitRemind();
+        waitRemind.setLoanApplicationId(loanApplicationId);
+        waitRemind.setLoanApplicationNumber(loanApplicationNumber);
+        waitRemind.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息待办");
+        waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
+        waitRemind.setRemindTime(DateUtils.getNowDate());
+        //如果退到 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 + "有一条贷款申请需及时处理");
             waitRemindList.add(waitRemind);
             userIdList.add(loanApplicationOld.getaUserId());
         } else if (loanApplication.getAuditSchedule().equals(THR)) {
-            WaitRemind waitRemind = new WaitRemind();
-            waitRemind.setLoanApplicationId(loanApplicationId);
-            waitRemind.setLoanApplicationNumber(loanApplicationNumber);
-            waitRemind.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息待办");
-            waitRemind.setRemindTime(DateUtils.getNowDate());
             waitRemind.setRemindType(THR);
             //给B角色发送待办提醒
             waitRemind.setReadUserId(loanApplicationOld.getbUserId().toString());
-            waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
             waitRemindList.add(waitRemind);
             userIdList.add(loanApplicationOld.getbUserId());
+        } else if (loanApplication.getAuditSchedule().equals(FOR)) {
+            waitRemind.setRemindType(FOR);
+            //给风险角色发送待办提醒
+            waitRemind.setReadUserId(loanApplicationOld.getfUserId().toString());
+            waitRemindList.add(waitRemind);
+            userIdList.add(loanApplicationOld.getfUserId());
         } else {
-            WaitRemind waitRemind = new WaitRemind();
-            waitRemind.setLoanApplicationId(loanApplicationId);
-            waitRemind.setLoanApplicationNumber(loanApplicationNumber);
-            waitRemind.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息待办");
-            waitRemind.setRemindTime(DateUtils.getNowDate());
             waitRemind.setRemindType(loanApplication.getAuditSchedule());
             //给A角色发送待办提醒
             waitRemind.setReadUserId(loanApplicationOld.getaUserId().toString());
-            waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
             waitRemindList.add(waitRemind);
             userIdList.add(loanApplicationOld.getaUserId());
+            //如果退回到初审风险合规  给风险发送待办
+            if (loanApplication.getAuditSchedule().equals(FIV)){
+                WaitRemind waitRemindf = new WaitRemind();
+                waitRemindf.setLoanApplicationId(loanApplicationId);
+                waitRemindf.setLoanApplicationNumber(loanApplicationNumber);
+                waitRemindf.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息待办");
+                waitRemindf.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
+                waitRemindf.setRemindTime(DateUtils.getNowDate());
+                waitRemindf.setReadUserId(loanApplicationOld.getfUserId().toString());
+                waitRemindList.add(waitRemindf);
+                userIdList.add(loanApplicationOld.getfUserId());
+            }
         }
         loanApplicationMapper.updateLoanApplication2(loanApplication);
 
@@ -1598,7 +1640,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         //删除所有代办提醒
         WaitRemind waitRemindDelete = new WaitRemind();
         waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-        waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
+        waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
         return AjaxResult.success();
     }
 
@@ -1613,9 +1655,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         //删除所有状态小于的待办事项
         WaitRemind waitRemindDelete = new WaitRemind();
         waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-        waitRemindDelete.setReadUserId(loanApplication.getaUserId().toString());
-        waitRemindDelete.setRemindType(FIF);
-        waitRemindMapper.deleteWaitRemindByLoanApplicationIdAndRemindType(waitRemindDelete);
+        waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
         WaitRemind waitRemind = new WaitRemind();
         waitRemind.setLoanApplicationId(loanApplication.getLoanApplicationId());
         waitRemind.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
@@ -1631,11 +1671,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         List<SysUserRole> sysUserRoles = sysUserRoleMapper.selectRoleListNoDataScope();
         if (sysUserRoles != null && sysUserRoles.size() > 0) {
             for (SysUserRole sysUserRole : sysUserRoles) {
-                //删除所有状态小于的待办事项
-                waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-                waitRemindDelete.setReadUserId(sysUserRole.getUserId().toString());
-                waitRemindDelete.setRemindType(FIF);
-                waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
+
                 WaitRemind waitRemindRole = new WaitRemind();
                 waitRemindRole.setLoanApplicationId(loanApplication.getLoanApplicationId());
                 waitRemindRole.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());

ruoyi-system/src/main/java/com/ruoyi/system/domain/review/ReviewComments.java

@@ -1,15 +1,15 @@
 package com.ruoyi.system.domain.review;
 
-import java.util.Date;
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.system.domain.conference.SysUserConference;
 import com.ruoyi.system.domain.loan.LoanApplicationFj;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * 业务审核意见对象 review_comments
@@ -37,7 +37,7 @@ public class ReviewComments extends BaseEntity
     private String auditSchedule;
 
     /** 审核状态 1：待审核 2：已通过 3：未通过  4:申诉 5:撤销*/
-    @Excel(name = "审核状态 1：待审核 2：已通过 3：未通过 4:申诉")
+    @Excel(name = "审核状态 1：待审核 2：已通过 3：未通过 4:申诉 5:撤销")
     private String auditType;
 
     /** 审核意见 */