新增 全局待办提醒

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

@@ -54,7 +54,7 @@ public class ShareholderFjController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:shareholderFj:listNoPage')")
     @GetMapping("/listNoPage")
     public AjaxResult listNoPage(ShareholderFj shareholderFj) {
-        List<ShareholderFj> list = shareholderFjService.selectShareholderFjList(shareholderFj);
+        List<ShareholderFj> list = shareholderFjService.selectShareholderFjListNoPage(shareholderFj);
         return AjaxResult.success(list);
     }
 

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

@@ -361,7 +361,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
     public AjaxResult sh(ReviewComments reviewComments) {
         reviewComments.setAuditTime(DateUtils.getNowDate());
         List<SysUserConference> sysUserConferenceList = reviewComments.getSysUserConferenceList();
-        //审核进度1：业务审核/分配 2：A角色审核 3：B角色审核 4：风险审核 5：尽职调查 6：初审风险合规 7：上会评审
+        //审核进度1：业务审核/分配 2：A角色审核 3：B角色审核 4：风险审核 5：初审风险合规 6：尽职调查7：上会评审
         String auditSchedule = reviewComments.getAuditSchedule();
         //审核状态 1：待审核 2：已通过 3：未通过 4:申诉
         String auditType = reviewComments.getAuditType();
@@ -406,12 +406,42 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         }
         //业务审核意见
         reviewCommentsMapper.insertReviewComments(reviewComments);
+        //待办信息集合
+        List<WaitRemind> waitRemindList = new ArrayList<>();
+        //查询审核管理员用户id
+        List<SysUserRole> sysUserRoles = sysUserRoleMapper.selectRoleListNoDataScope();
         //A角色进度之前审核不通过，直接放入回收站,之后的进入到申诉状态
         if (THR.equals(auditType) && ONE.equals(auditSchedule)) {
             loanApplication.setAuditType(auditType);
             loanApplication.setAuditSchedule(auditSchedule);
             loanApplication.setLoanApplicationType(THR);
             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 + "有一条贷款申请进入回收站需及时处理");
+            waitRemindList.add(waitRemind);
+            if (sysUserRoles != null && sysUserRoles.size() > 0){
+                for (SysUserRole sysUserRole : sysUserRoles) {
+                    WaitRemind waitRemindManager = new WaitRemind();
+                    waitRemindManager.setLoanApplicationId(loanApplicationId);
+                    waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+                    waitRemindManager.setRemindTitle("有一条【" + enterpriseName + "】的审核信息进入回收站");
+                    waitRemindManager.setRemindTime(DateUtils.getNowDate());
+                    waitRemindManager.setRemindType(TWO);
+                    waitRemindManager.setReadUserId(loanApplication.getaUserId().toString());
+                    waitRemindManager.setRemindContent(enterpriseName + "有一条贷款申请进入回收站需及时查看");
+                    //给管理员发送待办提醒
+                    waitRemindManager.setReadUserId(sysUserRole.getUserId().toString());
+                    waitRemindList.add(waitRemindManager);
+                }
+            }
+            waitRemindMapper.batchWaitRemind(waitRemindList);
             return AjaxResult.success();
             //A角色审核不通过 audit_schedule = 2的时候贷款申请进度处于担保初审状态
         } else if (THR.equals(auditType) && auditSchedule.equals(TWO)) {
@@ -420,6 +450,32 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             loanApplication.setAuditSchedule(auditSchedule);
             loanApplication.setLoanApplicationType(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 + "有一条贷款申请进入未通过需及时处理");
+            waitRemindList.add(waitRemind);
+            if (sysUserRoles != null && sysUserRoles.size() > 0){
+                for (SysUserRole sysUserRole : sysUserRoles) {
+                    WaitRemind waitRemindManager = new WaitRemind();
+                    waitRemindManager.setLoanApplicationId(loanApplicationId);
+                    waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+                    waitRemindManager.setRemindTitle("有一条【" + enterpriseName + "】的审核信息未通过");
+                    waitRemindManager.setRemindTime(DateUtils.getNowDate());
+                    waitRemindManager.setRemindType(TWO);
+                    waitRemindManager.setReadUserId(loanApplication.getaUserId().toString());
+                    waitRemindManager.setRemindContent(enterpriseName + "有一条贷款申请进入未通过需及时查看");
+                    //给管理员发送待办提醒
+                    waitRemindManager.setReadUserId(sysUserRole.getUserId().toString());
+                    waitRemindList.add(waitRemindManager);
+                }
+            }
+            waitRemindMapper.batchWaitRemind(waitRemindList);
             return AjaxResult.success();
             //审核流程结束
         } else if (THR.equals(auditType) && Integer.parseInt(auditSchedule) > 2) {
@@ -432,12 +488,28 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             WaitRemind waitRemind = new WaitRemind();
             waitRemind.setLoanApplicationId(loanApplicationId);
             waitRemind.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
-            waitRemind.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息待办");
+            waitRemind.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息进入申诉状态");
             waitRemind.setRemindTime(DateUtils.getNowDate());
             waitRemind.setRemindType(TWO);
             waitRemind.setReadUserId(loanApplication.getaUserId().toString());
-            waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
-            waitRemindMapper.insertWaitRemind(waitRemind);
+            waitRemind.setRemindContent(enterpriseName + "有一条贷款申请进入申诉状态需及时处理");
+            waitRemindList.add(waitRemind);
+            if (sysUserRoles != null && sysUserRoles.size() > 0){
+                for (SysUserRole sysUserRole : sysUserRoles) {
+                    WaitRemind waitRemindManager = new WaitRemind();
+                    waitRemindManager.setLoanApplicationId(loanApplicationId);
+                    waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+                    waitRemindManager.setRemindTitle("有一条【" + enterpriseName + "】的审核信息进入申诉状态");
+                    waitRemindManager.setRemindTime(DateUtils.getNowDate());
+                    waitRemindManager.setRemindType(TWO);
+                    waitRemindManager.setReadUserId(loanApplication.getaUserId().toString());
+                    waitRemindManager.setRemindContent(enterpriseName + "有一条贷款申请进入申诉状态需及时处理");
+                    //给管理员发送待办提醒
+                    waitRemindManager.setReadUserId(sysUserRole.getUserId().toString());
+                    waitRemindList.add(waitRemindManager);
+                }
+            }
+            waitRemindMapper.batchWaitRemind(waitRemindList);
             return AjaxResult.success();
         }
         //通过,进入到下一个步骤
@@ -445,7 +517,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             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)) {
@@ -456,8 +528,23 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 loanApplication.setbUserName(reviewComments.getbUserName());
                 //给A角色发送待办提醒
                 waitRemind.setReadUserId(reviewComments.getaUserId().toString());
-                waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
-                waitRemindMapper.insertWaitRemind(waitRemind);
+                waitRemind.setRemindContent(enterpriseName + "有一条申请贷款信息审核通过");
+                waitRemindList.add(waitRemind);
+                if (sysUserRoles != null && sysUserRoles.size() > 0){
+                    for (SysUserRole sysUserRole : sysUserRoles) {
+                        WaitRemind waitRemindManager = new WaitRemind();
+                        waitRemindManager.setLoanApplicationId(loanApplicationId);
+                        waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+                        waitRemindManager.setRemindTitle("有一条【" + enterpriseName + "】的审核信息申请通过进入到下一阶段");
+                        waitRemindManager.setRemindTime(DateUtils.getNowDate());
+                        waitRemindManager.setRemindType(TWO);
+                        waitRemindManager.setReadUserId(loanApplication.getaUserId().toString());
+                        waitRemindManager.setRemindContent(enterpriseName + "有一条贷款申请审核通过进入到下一阶段");
+                        //给管理员发送待办提醒
+                        waitRemindManager.setReadUserId(sysUserRole.getUserId().toString());
+                        waitRemindList.add(waitRemindManager);
+                    }
+                }
             }
             //保存参会人员数据
             if (sysUserConferenceList != null && sysUserConferenceList.size() > 0 && auditSchedule.equals(SEV)) {
@@ -472,29 +559,70 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                     //给B角色发送待办提醒
                     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);
+                    waitRemindList.add(waitRemind);
+                    if (sysUserRoles != null && sysUserRoles.size() > 0){
+                        for (SysUserRole sysUserRole : sysUserRoles) {
+                            WaitRemind waitRemindManager = new WaitRemind();
+                            waitRemindManager.setLoanApplicationId(loanApplicationId);
+                            waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+                            waitRemindManager.setRemindTitle("有一条【" + enterpriseName + "】的审核信息申请通过进入到下一阶段");
+                            waitRemindManager.setRemindTime(DateUtils.getNowDate());
+                            waitRemindManager.setRemindType(TWO);
+                            waitRemindManager.setReadUserId(loanApplication.getaUserId().toString());
+                            waitRemindManager.setRemindContent(enterpriseName + "有一条贷款申请审核通过进入到下一阶段");
+                            //给管理员发送待办提醒
+                            waitRemindManager.setReadUserId(sysUserRole.getUserId().toString());
+                            waitRemindList.add(waitRemindManager);
+                        }
+                    }
                 }
                 //审核流程结束
             } else if (auditSchedule.equals(SEV)) {
                 loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(loanScheduleOld) + 1));
                 loanApplication.setAuditSchedule(auditSchedule);
                 loanApplication.setAuditType(auditType);
+                //给A角色发送待办提醒
+                waitRemind.setReadUserId(loanApplication.getaUserId().toString());
+                waitRemind.setRemindContent(enterpriseName + "的审核信息申请通过进入到下一阶段");
+                waitRemindList.add(waitRemind);
+                if (sysUserRoles != null && sysUserRoles.size() > 0){
+                    for (SysUserRole sysUserRole : sysUserRoles) {
+                        WaitRemind waitRemindManager = new WaitRemind();
+                        waitRemindManager.setLoanApplicationId(loanApplicationId);
+                        waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+                        waitRemindManager.setRemindTitle("有一条【" + enterpriseName + "】的审核信息进入到下一阶段");
+                        waitRemindManager.setRemindTime(DateUtils.getNowDate());
+                        waitRemindManager.setRemindType(TWO);
+                        waitRemindManager.setReadUserId(loanApplication.getaUserId().toString());
+                        waitRemindManager.setRemindContent(enterpriseName + "的审核信息申请通过进入到下一阶段");
+                        //给管理员发送待办提醒
+                        waitRemindManager.setReadUserId(sysUserRole.getUserId().toString());
+                        waitRemindList.add(waitRemindManager);
+                    }
+                }
             } else {
                 loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(loanScheduleOld) + 1));
                 loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) + 1));
                 loanApplication.setAuditType(ONE);
+                //给A角色发送待办提醒
+                waitRemind.setReadUserId(loanApplication.getaUserId().toString());
+                waitRemind.setRemindContent(enterpriseName + "的审核信息申请通过进入到下一阶段");
+                waitRemindList.add(waitRemind);
+                if (sysUserRoles != null && sysUserRoles.size() > 0){
+                    for (SysUserRole sysUserRole : sysUserRoles) {
+                        WaitRemind waitRemindManager = new WaitRemind();
+                        waitRemindManager.setLoanApplicationId(loanApplicationId);
+                        waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+                        waitRemindManager.setRemindTitle("有一条【" + enterpriseName + "】的审核信息进入到下一阶段");
+                        waitRemindManager.setRemindTime(DateUtils.getNowDate());
+                        waitRemindManager.setRemindType(TWO);
+                        waitRemindManager.setReadUserId(loanApplication.getaUserId().toString());
+                        waitRemindManager.setRemindContent(enterpriseName + "的审核信息申请通过进入到下一阶段");
+                        //给管理员发送待办提醒
+                        waitRemindManager.setReadUserId(sysUserRole.getUserId().toString());
+                        waitRemindList.add(waitRemindManager);
+                    }
+                }
             }
             loanApplicationMapper.updateLoanApplication(loanApplication);
             //插入流程记录表
@@ -505,6 +633,8 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             loanSchedule.setLoanScheduleScore(Long.parseLong(loanApplication.getLoanSchedule()));
             loanSchedule.setLoanScheduleTime(DateUtils.getNowDate());
             loanScheduleMapper.insertLoanSchedule(loanSchedule);
+            //插入审核通过的待办提醒
+            waitRemindMapper.batchWaitRemind(waitRemindList);
         }
         return AjaxResult.success();
     }
@@ -555,6 +685,37 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             application.setAuditType(ONE);
         }
         loanApplicationMapper.updateLoanApplication(application);
+
+        //给A角色发送待办提醒
+        //待办信息集合
+        //查询审核管理员用户id
+        List<SysUserRole> sysUserRoles = sysUserRoleMapper.selectRoleListNoDataScope();
+        List<WaitRemind> waitRemindList = new ArrayList<>();
+        WaitRemind waitRemind = new WaitRemind();
+        waitRemind.setLoanApplicationId(loanApplication.getLoanApplicationId());
+        waitRemind.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+        waitRemind.setRemindTitle("您有一条【" + loanApplication.getEnterpriseName() + "】的审核信息进入到下一阶段");
+        waitRemind.setRemindTime(DateUtils.getNowDate());
+        waitRemind.setRemindType(loanSchedule);
+        waitRemind.setReadUserId(loanApplication.getaUserId().toString());
+        waitRemind.setRemindContent(loanApplication.getEnterpriseName() + "的审核信息申请通过进入到下一阶段");
+        waitRemindList.add(waitRemind);
+        if (sysUserRoles != null && sysUserRoles.size() > 0){
+            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(loanSchedule);
+                waitRemindManager.setReadUserId(loanApplication.getaUserId().toString());
+                waitRemindManager.setRemindContent(loanApplication.getEnterpriseName() + "的审核信息申请通过进入到下一阶段");
+                //给管理员发送待办提醒
+                waitRemindManager.setReadUserId(sysUserRole.getUserId().toString());
+                waitRemindList.add(waitRemindManager);
+            }
+        }
+        waitRemindMapper.batchWaitRemind(waitRemindList);
         return AjaxResult.success();
     }
 
@@ -572,6 +733,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         String auditSchedule = loanApplication.getAuditSchedule();
         String loanApplicationType = loanApplication.getLoanApplicationType();
         String auditType = loanApplication.getAuditType();
+        List<WaitRemind> waitRemindList = new ArrayList<>();
 
         LoanApplication loanApplicationOld = loanApplicationMapper.selectLoanApplicationByLoanApplicationId(loanApplicationId);
         reviewCommentsMapper.deleteReviewCommentsByLoanApplicationIdAndAuditSchedule(loanApplicationId, auditSchedule);
@@ -604,7 +766,8 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             loanApplicationFjMapper.deleteLoanApplicationFjByLoanApplicationIdAndType(loanApplication.getLoanApplicationId(), type.split(","));
             String enterpriseName = loanApplicationOld.getEnterpriseName();
             String loanApplicationNumber = loanApplicationOld.getLoanApplicationNumber();
-            //如果退到 A角色审核 B角色审核 还需要插入待审核
+
+            //如果退到 A角色审核 B角色审核 还需要插入待办提醒
             if (loanApplication.getAuditSchedule().equals(TWO)) {
                 WaitRemind waitRemind = new WaitRemind();
                 waitRemind.setLoanApplicationId(loanApplicationId);
@@ -615,7 +778,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 //给A角色发送待办提醒
                 waitRemind.setReadUserId(loanApplicationOld.getaUserId().toString());
                 waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
-                waitRemindMapper.insertWaitRemind(waitRemind);
+                waitRemindList.add(waitRemind);
             }
             if (loanApplication.getAuditSchedule().equals(THR)) {
                 WaitRemind waitRemind = new WaitRemind();
@@ -627,10 +790,41 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 //给B角色发送待办提醒
                 waitRemind.setReadUserId(loanApplicationOld.getbUserId().toString());
                 waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
-                waitRemindMapper.insertWaitRemind(waitRemind);
+                waitRemindList.add(waitRemind);
             }
         }
         loanApplicationMapper.updateLoanApplication(loanApplication);
+
+
+        //给A角色发送待办提醒
+        //待办信息集合
+        //查询审核管理员用户id
+        List<SysUserRole> sysUserRoles = sysUserRoleMapper.selectRoleListNoDataScope();
+        WaitRemind waitRemind = new WaitRemind();
+        waitRemind.setLoanApplicationId(loanApplication.getLoanApplicationId());
+        waitRemind.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+        waitRemind.setRemindTitle("您有一条【" + loanApplication.getEnterpriseName() + "】的信息进行了撤销");
+        waitRemind.setRemindTime(DateUtils.getNowDate());
+        waitRemind.setRemindType(loanSchedule);
+        waitRemind.setReadUserId(loanApplication.getaUserId().toString());
+        waitRemind.setRemindContent(loanApplication.getEnterpriseName() + "的信息进行了撤销");
+        waitRemindList.add(waitRemind);
+        if (sysUserRoles != null && sysUserRoles.size() > 0){
+            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(loanSchedule);
+                waitRemindManager.setReadUserId(loanApplication.getaUserId().toString());
+                waitRemindManager.setRemindContent(loanApplication.getEnterpriseName() + "的信息进行了撤销");
+                //给管理员发送待办提醒
+                waitRemindManager.setReadUserId(sysUserRole.getUserId().toString());
+                waitRemindList.add(waitRemindManager);
+            }
+        }
+        waitRemindMapper.batchWaitRemind(waitRemindList);
         return AjaxResult.success();
     }
 
@@ -727,6 +921,37 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         loanApplicationFj.setCreateTime(DateUtils.getNowDate());
         loanApplicationFjMapper.insertLoanApplicationFj(loanApplicationFj);
         loanApplicationMapper.updateLoanApplication(loanApplication);
+
+        //给A角色发送待办提醒
+        //待办信息集合
+        //查询审核管理员用户id
+        List<SysUserRole> sysUserRoles = sysUserRoleMapper.selectRoleListNoDataScope();
+        List<WaitRemind> waitRemindList = new ArrayList<>();
+        WaitRemind waitRemind = new WaitRemind();
+        waitRemind.setLoanApplicationId(loanApplication.getLoanApplicationId());
+        waitRemind.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+        waitRemind.setRemindTitle("您有一条【" + loanApplication.getEnterpriseName() + "】的信息进入归档");
+        waitRemind.setRemindTime(DateUtils.getNowDate());
+        waitRemind.setRemindType(loanSchedule);
+        waitRemind.setReadUserId(loanApplication.getaUserId().toString());
+        waitRemind.setRemindContent(loanApplication.getEnterpriseName() + "的信息进入归档");
+        waitRemindList.add(waitRemind);
+        if (sysUserRoles != null && sysUserRoles.size() > 0){
+            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(loanSchedule);
+                waitRemindManager.setReadUserId(loanApplication.getaUserId().toString());
+                waitRemindManager.setRemindContent(loanApplication.getEnterpriseName() + "的信息进入归档");
+                //给管理员发送待办提醒
+                waitRemindManager.setReadUserId(sysUserRole.getUserId().toString());
+                waitRemindList.add(waitRemindManager);
+            }
+        }
+        waitRemindMapper.batchWaitRemind(waitRemindList);
         return AjaxResult.success();
     }
 
@@ -758,7 +983,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 waitRemindRole.setRemindTitle("您有一条风险部暂缓出具【" + loanApplication.getEnterpriseName() + "】放款合规表的申请");
                 waitRemindRole.setRemindTime(DateUtils.getNowDate());
                 waitRemindRole.setRemindType(SIX);
-                //给A角色发送待办提醒
+                //给管理员发送待办提醒
                 waitRemindRole.setReadUserId(sysUserRole.getUserId().toString());
                 //getRemark()风险部暂缓出具的原因
                 waitRemindRole.setRemindContent(loanApplication.getRemark());

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

@@ -36,6 +36,7 @@ public interface WaitRemindMapper
      * @return 结果
      */
     public int insertWaitRemind(WaitRemind waitRemind);
+    public int batchWaitRemind(List<WaitRemind> waitRemind);
 
     /**
      * 修改待办提醒

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

@@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spouseName != null  and spouseName != ''"> and spouse_name like concat('%', #{spouseName}, '%')</if>
             <if test="spouseIdCard != null  and spouseIdCard != ''"> and spouse_id_card = #{spouseIdCard}</if>
             <if test="spousePhone != null  and spousePhone != ''"> and spouse_phone = #{spousePhone}</if>
-            <if test="guaranteeType != null  and guaranteeType != ''"> and guarantee_type = #{guaranteeType}</if>
+            <if test="guaranteeType != null  and guaranteeType != ''"> and FIND_IN_SET(guarantee_type,#{guaranteeType}</if>
             <if test="guaranteeFront != null  and guaranteeFront != ''"> and guarantee_front = #{guaranteeFront}</if>
             <if test="guaranteeBack != null  and guaranteeBack != ''"> and guarantee_back = #{guaranteeBack}</if>
             <if test="guaranteeName != null  and guaranteeName != ''"> and guarantee_name like concat('%', #{guaranteeName}, '%')</if>

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

@@ -83,6 +83,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
+    <insert id="batchWaitRemind">
+        insert into wait_remind(loan_application_id, loan_application_number, remind_title, remind_type, remind_content,remind_time,
+        read_user_id,is_read,status, create_by, create_time, update_by, update_time, remark) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            (#{item.loanApplicationId},#{item.loanApplicationNumber},#{item.remindTitle},#{item.remindType},#{item.remindContent},#{item.remindTime},#{item.readUserId},#{item.isRead},#{item.status},#{item.createBy},sysdate(),#{item.updateBy},#{item.updateTime},#{item.remark})
+        </foreach>
+    </insert>
     <update id="updateWaitRemind" parameterType="WaitRemind">
         update wait_remind
         <trim prefix="SET" suffixOverrides=",">