fix 待办流程提醒

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

@@ -998,7 +998,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 loanApplication.setAuditType(ONE);
 
                 if (auditSchedule.equals(FOR)){
-                    //给初审风险合规状态下的风险发送
+                    //给初审风险合规 状态下的风险发送
                     WaitRemind waitRemindf = new WaitRemind();
                     waitRemindf.setLoanApplicationId(loanApplicationId);
                     waitRemindf.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
@@ -1219,11 +1219,25 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         LoanApplication application = new LoanApplication();
         application.setLoanApplicationId(loanApplication.getLoanApplicationId());
         application.setAuditType(TWO);
-
-
+        //给A角色发送待办提醒
+        //待办信息集合
+        //查询审核管理员用户id
+        List<SysUserRole> sysUserRoles = sysUserRoleMapper.selectRoleListNoDataScope();
+        List<WaitRemind> waitRemindList = new ArrayList<>();
+        List<Long> userIdList = new ArrayList<>();
         if (SEV.equals(loanSchedule)) {
             application.setLoanSchedule(EIG);
             application.setAuditSchedule(NIN);
+            WaitRemind waitRemindf = new WaitRemind();
+            waitRemindf.setLoanApplicationId(loanApplication.getLoanApplicationId());
+            waitRemindf.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+            waitRemindf.setRemindTitle("您有一条【" + loanApplication.getEnterpriseName() + "】的审核信息进入到下一阶段");
+            waitRemindf.setRemindTime(DateUtils.getNowDate());
+            waitRemindf.setRemindType(application.getAuditSchedule());
+            waitRemindf.setReadUserId(loanApplication.getfUserId().toString());
+            waitRemindf.setRemindContent(loanApplication.getEnterpriseName() + "的审核信息申请通过进入到下一阶段");
+            waitRemindList.add(waitRemindf);
+            userIdList.add(loanApplication.getfUserId());
         }
         if (EIG.equals(loanSchedule)) {
             application.setLoanSchedule(NIN);
@@ -1234,11 +1248,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         WaitRemind waitRemindDelete = new WaitRemind();
         waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
         waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
-        //给A角色发送待办提醒
-        //待办信息集合
-        //查询审核管理员用户id
-        List<SysUserRole> sysUserRoles = sysUserRoleMapper.selectRoleListNoDataScope();
-        List<WaitRemind> waitRemindList = new ArrayList<>();
+
         WaitRemind waitRemind = new WaitRemind();
         waitRemind.setLoanApplicationId(loanApplication.getLoanApplicationId());
         waitRemind.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
@@ -1248,7 +1258,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         waitRemind.setReadUserId(loanApplication.getaUserId().toString());
         waitRemind.setRemindContent(loanApplication.getEnterpriseName() + "的审核信息申请通过进入到下一阶段");
         waitRemindList.add(waitRemind);
-        List<Long> userIdList = new ArrayList<>();
+        userIdList.add(loanApplication.getaUserId());
         if (sysUserRoles != null && sysUserRoles.size() > 0) {
             //极光推送
             userIdList = sysUserRoles.stream().map(SysUserRole::getUserId).collect(Collectors.toList());
@@ -1396,8 +1406,8 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             waitRemind.setReadUserId(loanApplicationOld.getbUserId().toString());
             waitRemindList.add(waitRemind);
             userIdList.add(loanApplicationOld.getbUserId());
-        } else if (loanApplication.getAuditSchedule().equals(FOR)) {
-            waitRemind.setRemindType(FOR);
+        } else if (loanApplication.getAuditSchedule().equals(FOR) || loanApplication.getAuditSchedule().equals(EIG)) {
+            waitRemind.setRemindType(loanApplication.getAuditSchedule());
             //给风险角色发送待办提醒
             waitRemind.setReadUserId(loanApplicationOld.getfUserId().toString());
             waitRemindList.add(waitRemind);