fix 待办流程提醒

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

@@ -4,7 +4,6 @@ package com.ruoyi.framework.web.service;
 import com.alibaba.fastjson2.JSONObject;
 import com.deepoove.poi.data.PictureRenderData;
 import com.deepoove.poi.data.Pictures;
-import com.itextpdf.text.DocumentException;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -16,8 +15,8 @@ import com.ruoyi.common.utils.*;
 import com.ruoyi.common.utils.jPush.JPushToolUtil;
 import com.ruoyi.common.utils.poi.ExcelFillUtils;
 import com.ruoyi.common.utils.poi.WordUtil;
-import com.ruoyi.common.utils.uuid.Seq;
 import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.common.utils.uuid.Seq;
 import com.ruoyi.framework.manager.AsyncManager;
 import com.ruoyi.framework.manager.factory.AsyncFactory;
 import com.ruoyi.system.domain.SysUserRole;
@@ -35,40 +34,20 @@ import com.ruoyi.system.mapper.*;
 import com.ruoyi.system.service.ISysUserService;
 import com.ruoyi.system.service.loan.ILoanApplicationService;
 import org.apache.commons.lang3.ObjectUtils;
-import org.apache.poi.hwpf.HWPFDocument;
-import org.apache.poi.hwpf.usermodel.Range;
-import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.io.*;
 import java.util.*;
-import java.io.File;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.apache.poi.xwpf.usermodel.XWPFParagraph;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.text.PDFTextStripper;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-
-
 import static com.ruoyi.common.constant.CommonConstants.*;
 
-import javax.annotation.Resource;
-
 /**
  * 贷款申请主Service业务层处理
  *
@@ -721,12 +700,10 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             loanApplication.setAuditType(FOR);
             loanApplication.setLoanApplicationType(TWO);
             loanApplicationMapper.updateLoanApplication(loanApplication);
-            //删除已处理的待办信息
+            //删除所有待办信息
             WaitRemind waitRemindDelete = new WaitRemind();
             waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-            waitRemindDelete.setReadUserId(loanApplication.getaUserId().toString());
-            waitRemindDelete.setRemindType(TWO);
-            waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
+            waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
             //给A角色，审核管理员发送待办
             WaitRemind waitRemind = new WaitRemind();
             waitRemind.setLoanApplicationId(loanApplicationId);
@@ -784,12 +761,10 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             //进入到A角色申诉状态保留当前项目状态，只把audit_type改为申诉
             loanApplication.setAuditType(FOR);
             loanApplicationMapper.updateLoanApplication(loanApplication);
-            //删除已处理的待办信息
+            //删除所有的待办信息
             WaitRemind waitRemindDelete = new WaitRemind();
             waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-            waitRemindDelete.setReadUserId(loanApplication.getaUserId().toString());
-            waitRemindDelete.setRemindType(TWO);
-            waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
+            waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
             //给A角色发送待办提醒
             WaitRemind waitRemind = new WaitRemind();
             waitRemind.setLoanApplicationId(loanApplicationId);
@@ -804,12 +779,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);
                     waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
@@ -858,9 +827,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             if (auditSchedule.equals(ONE)) {
                 //删除已处理的待办信息
                 waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-                waitRemindDelete.setReadUserId(loanApplication.getaUserId().toString());
-                waitRemindDelete.setRemindType(TWO);
-                waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
+                waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
                 loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(loanScheduleOld) + 1));
                 loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) + 1));
                 loanApplication.setAuditType(ONE);
@@ -880,11 +847,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);
@@ -913,12 +875,13 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                     //删除已处理的待办信息
 
                     waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-                    waitRemindDelete.setReadUserId(loanApplication.getbUserId().toString());
+                    waitRemindDelete.setReadUserId(loanApplication.getaUserId().toString());
                     waitRemindDelete.setRemindType(TWO);
                     waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
                     //给B角色发送待办提醒
                     waitRemind.setReadUserId(loanApplication.getbUserId().toString());
                     waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
+                    waitRemind.setRemindType(THR);
                     waitRemindList.add(waitRemind);
                     if (sysUserRoles != null && sysUserRoles.size() > 0) {
                         //极光推送
@@ -936,7 +899,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                             waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
                             waitRemindManager.setRemindTitle("有一条【" + enterpriseName + "】的审核信息申请通过进入到下一阶段");
                             waitRemindManager.setRemindTime(DateUtils.getNowDate());
-                            waitRemindManager.setRemindType(TWO);
+                            waitRemindManager.setRemindType(THR);
                             waitRemindManager.setReadUserId(loanApplication.getaUserId().toString());
                             waitRemindManager.setRemindContent(enterpriseName + "有一条贷款申请审核通过进入到下一阶段");
                             //给管理员发送待办提醒
@@ -950,12 +913,13 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                     //删除已处理的待办信息
 
                     waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-                    waitRemindDelete.setReadUserId(loanApplication.getfUserId().toString());
-                    waitRemindDelete.setRemindType(TWO);
+                    waitRemindDelete.setReadUserId(loanApplication.getbUserId().toString());
+                    waitRemindDelete.setRemindType(THR);
                     waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
                     //给风险角色发送待办提醒
                     waitRemind.setReadUserId(loanApplication.getfUserId().toString());
                     waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
+                    waitRemind.setRemindType(FOR);
                     waitRemindList.add(waitRemind);
                     if (sysUserRoles != null && sysUserRoles.size() > 0) {
                         //极光推送
@@ -966,7 +930,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                             //删除已处理的待办信息
                             waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
                             waitRemindDelete.setReadUserId(sysUserRole.getUserId().toString());
-                            waitRemindDelete.setRemindType(TWO);
+                            waitRemindDelete.setRemindType(THR);
                             waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
 
                             WaitRemind waitRemindManager = new WaitRemind();
@@ -974,7 +938,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                             waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
                             waitRemindManager.setRemindTitle("有一条【" + enterpriseName + "】的审核信息申请通过进入到下一阶段");
                             waitRemindManager.setRemindTime(DateUtils.getNowDate());
-                            waitRemindManager.setRemindType(TWO);
+                            waitRemindManager.setRemindType(FOR);
                             waitRemindManager.setReadUserId(loanApplication.getaUserId().toString());
                             waitRemindManager.setRemindContent(enterpriseName + "有一条贷款申请审核通过进入到下一阶段");
                             //给管理员发送待办提醒
@@ -993,10 +957,10 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
 
                 waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
                 waitRemindDelete.setReadUserId(loanApplication.getaUserId().toString());
-                waitRemindDelete.setRemindType(loanApplication.getLoanSchedule());
+                waitRemindDelete.setRemindType(auditSchedule);
                 waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
                 //给A角色发送待办提醒
-                waitRemind.setRemindType(loanApplication.getLoanSchedule());
+                waitRemind.setRemindType(loanApplication.getAuditSchedule());
                 waitRemind.setReadUserId(loanApplication.getaUserId().toString());
                 waitRemind.setRemindContent(enterpriseName + "的审核信息申请通过进入到下一阶段");
                 waitRemindList.add(waitRemind);
@@ -1008,14 +972,14 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                         //删除已处理的待办信息
                         waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
                         waitRemindDelete.setReadUserId(sysUserRole.getUserId().toString());
-                        waitRemindDelete.setRemindType(TWO);
+                        waitRemindDelete.setRemindType(auditSchedule);
                         waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
                         WaitRemind waitRemindManager = new WaitRemind();
                         waitRemindManager.setLoanApplicationId(loanApplicationId);
                         waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
                         waitRemindManager.setRemindTitle("有一条【" + enterpriseName + "】的审核信息进入到下一阶段");
                         waitRemindManager.setRemindTime(DateUtils.getNowDate());
-                        waitRemindManager.setRemindType(loanApplication.getLoanSchedule());
+                        waitRemindManager.setRemindType(loanApplication.getAuditSchedule());
                         waitRemindManager.setRemindContent(enterpriseName + "的审核信息申请通过进入到下一阶段");
                         //给管理员发送待办提醒
                         waitRemindManager.setReadUserId(sysUserRole.getUserId().toString());
@@ -1162,22 +1126,22 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         WaitRemind waitRemindDelete = new WaitRemind();
         waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
         waitRemindDelete.setReadUserId(loanApplication.getaUserId().toString());
-        waitRemindDelete.setRemindType(SIX);
-        waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
+        waitRemindDelete.setRemindType(SEV);
+        //删除所有状态值不等于的待办
+        waitRemindMapper.deleteWaitRemindByLoanApplicationIdAndRemindType(waitRemindDelete);
         //给A角色发送上会审核信息
         WaitRemind waitRemindManager = new WaitRemind();
         waitRemindManager.setLoanApplicationId(loanApplication.getLoanApplicationId());
         waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
         waitRemindManager.setRemindTitle("有一条【" + loanApplication.getEnterpriseName() + "】的上会审核信息");
         waitRemindManager.setRemindTime(DateUtils.getNowDate());
-        waitRemindManager.setRemindType(SIX);
+        waitRemindManager.setRemindType(SEV);
         waitRemindManager.setReadUserId(loanApplication.getaUserId().toString());
         String result = "通过";
         if (TWO.equals(reviewSchedule)) {
             result = "不通过";
         }
         waitRemindManager.setRemindContent(loanApplication.getEnterpriseName() + "的上会审核信息申请" + result);
-        //给管理员发送待办提醒
         waitRemindManager.setReadUserId(String.valueOf(loanApplication.getaUserId()));
         waitRemindMapper.insertWaitRemind(waitRemindManager);
 
@@ -1210,6 +1174,8 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         LoanApplication application = new LoanApplication();
         application.setLoanApplicationId(loanApplication.getLoanApplicationId());
         application.setAuditType(TWO);
+
+
         if (SEV.equals(loanSchedule)) {
             application.setLoanSchedule(EIG);
             application.setAuditSchedule(NIN);
@@ -1223,8 +1189,8 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         WaitRemind waitRemindDelete = new WaitRemind();
         waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
         waitRemindDelete.setReadUserId(loanApplication.getaUserId().toString());
-        waitRemindDelete.setRemindType(loanSchedule);
-        waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
+        waitRemindDelete.setRemindType(application.getAuditSchedule());
+        waitRemindMapper.deleteWaitRemindByLoanApplicationIdAndRemindType(waitRemindDelete);
         //给A角色发送待办提醒
         //待办信息集合
         //查询审核管理员用户id
@@ -1235,7 +1201,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         waitRemind.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
         waitRemind.setRemindTitle("您有一条【" + loanApplication.getEnterpriseName() + "】的审核信息进入到下一阶段");
         waitRemind.setRemindTime(DateUtils.getNowDate());
-        waitRemind.setRemindType(loanSchedule);
+        waitRemind.setRemindType(application.getAuditSchedule());
         waitRemind.setReadUserId(loanApplication.getaUserId().toString());
         waitRemind.setRemindContent(loanApplication.getEnterpriseName() + "的审核信息申请通过进入到下一阶段");
         waitRemindList.add(waitRemind);
@@ -1249,15 +1215,15 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 //删除所有状态小于的待办事项
                 waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
                 waitRemindDelete.setReadUserId(sysUserRole.getUserId().toString());
-                waitRemindDelete.setRemindType(loanSchedule);
-                waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
+                waitRemindDelete.setRemindType(application.getAuditSchedule());
+                waitRemindMapper.deleteWaitRemindByLoanApplicationIdAndRemindType(waitRemindDelete);
 
                 WaitRemind waitRemindManager = new WaitRemind();
                 waitRemindManager.setLoanApplicationId(loanApplication.getLoanApplicationId());
                 waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
                 waitRemindManager.setRemindTitle("有一条【" + loanApplication.getEnterpriseName() + "】的审核信息进入到下一阶段");
                 waitRemindManager.setRemindTime(DateUtils.getNowDate());
-                waitRemindManager.setRemindType(loanSchedule);
+                waitRemindManager.setRemindType(application.getAuditSchedule());
                 waitRemindManager.setReadUserId(loanApplication.getaUserId().toString());
                 waitRemindManager.setRemindContent(loanApplication.getEnterpriseName() + "的审核信息申请通过进入到下一阶段");
                 //给管理员发送待办提醒
@@ -1372,12 +1338,10 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
 
             //如果退到 A角色审核 B角色审核 还需要插入待办提醒
             if (loanApplication.getAuditSchedule().equals(TWO)) {
-                //删除所有状态小于的待办事项
+                //删除所有待办事项
                 WaitRemind waitRemindDelete = new WaitRemind();
                 waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-                waitRemindDelete.setReadUserId(loanApplicationOld.getaUserId().toString());
-                waitRemindDelete.setRemindType(TWO);
-                waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
+                waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
                 WaitRemind waitRemind = new WaitRemind();
                 waitRemind.setLoanApplicationId(loanApplicationId);
                 waitRemind.setLoanApplicationNumber(loanApplicationNumber);
@@ -1395,15 +1359,14 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 //删除所有状态小于的待办事项
                 WaitRemind waitRemindDelete = new WaitRemind();
                 waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-                waitRemindDelete.setReadUserId(loanApplicationOld.getbUserId().toString());
-                waitRemindDelete.setRemindType(TWO);
-                waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
+
+                waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
                 WaitRemind waitRemind = new WaitRemind();
                 waitRemind.setLoanApplicationId(loanApplicationId);
                 waitRemind.setLoanApplicationNumber(loanApplicationNumber);
                 waitRemind.setRemindTitle("您有一条【" + enterpriseName + "】的审核信息待办");
                 waitRemind.setRemindTime(DateUtils.getNowDate());
-                waitRemind.setRemindType(TWO);
+                waitRemind.setRemindType(THR);
                 //给B角色发送待办提醒
                 waitRemind.setReadUserId(loanApplicationOld.getbUserId().toString());
                 waitRemind.setRemindContent(enterpriseName + "有一条贷款申请需及时处理");
@@ -1417,7 +1380,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
 
         //给A角色发送待办提醒
         //待办信息集合
-        //查询审核管理员用户id
+/*        //查询审核管理员用户id
         List<SysUserRole> sysUserRoles = sysUserRoleMapper.selectRoleListNoDataScope();
         if (ObjectUtils.isNotEmpty(loanApplication.getaUserId())) {
 
@@ -1464,7 +1427,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 }
             }
             userIdList.add(loanApplication.getaUserId());
-        }
+        }*/
 
         if (waitRemindList != null && waitRemindList.size() > 0) {
             waitRemindMapper.batchWaitRemind(waitRemindList);
@@ -1680,6 +1643,10 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         reviewComments.setAuditTime(DateUtils.getNowDate());
         reviewComments.setCreateBy(SecurityUtils.getUsername());
         reviewCommentsMapper.insertReviewComments(reviewComments);
+        //删除所有代办提醒
+        WaitRemind waitRemindDelete = new WaitRemind();
+        waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
+        waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
         return AjaxResult.success();
     }
 
@@ -1695,14 +1662,14 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         WaitRemind waitRemindDelete = new WaitRemind();
         waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
         waitRemindDelete.setReadUserId(loanApplication.getaUserId().toString());
-        waitRemindDelete.setRemindType(EIG);
-        waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
+        waitRemindDelete.setRemindType(TEN);
+        waitRemindMapper.deleteWaitRemindByLoanApplicationIdAndRemindType(waitRemindDelete);
         WaitRemind waitRemind = new WaitRemind();
         waitRemind.setLoanApplicationId(loanApplication.getLoanApplicationId());
         waitRemind.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
         waitRemind.setRemindTitle("您有一条风险部暂缓出具【" + loanApplication.getEnterpriseName() + "】放款合规表的申请");
         waitRemind.setRemindTime(DateUtils.getNowDate());
-        waitRemind.setRemindType(EIG);
+        waitRemind.setRemindType(NIN);
         //给A角色发送待办提醒
         waitRemind.setReadUserId(loanApplication.getaUserId().toString());
         //getRemark()风险部暂缓出具的原因
@@ -1715,14 +1682,14 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 //删除所有状态小于的待办事项
                 waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
                 waitRemindDelete.setReadUserId(sysUserRole.getUserId().toString());
-                waitRemindDelete.setRemindType(EIG);
+                waitRemindDelete.setRemindType(TEN);
                 waitRemindMapper.deleteWaitRemindByLoanApplicationId(waitRemindDelete);
                 WaitRemind waitRemindRole = new WaitRemind();
                 waitRemindRole.setLoanApplicationId(loanApplication.getLoanApplicationId());
                 waitRemindRole.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
                 waitRemindRole.setRemindTitle("您有一条风险部暂缓出具【" + loanApplication.getEnterpriseName() + "】放款合规表的申请");
                 waitRemindRole.setRemindTime(DateUtils.getNowDate());
-                waitRemindRole.setRemindType(EIG);
+                waitRemindRole.setRemindType(NIN);
                 //给管理员发送待办提醒
                 waitRemindRole.setReadUserId(sysUserRole.getUserId().toString());
                 //getRemark()风险部暂缓出具的原因

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

@@ -57,6 +57,10 @@ public interface WaitRemindMapper
     public int deleteWaitRemindByRemindId(Integer remindId);
     public int deleteWaitRemindByReadUserId(WaitRemind waitRemind);
     public int deleteWaitRemindByLoanApplicationId(WaitRemind waitRemind);
+    //删除所有状态值不等于的待办
+    public int deleteWaitRemindByLoanApplicationIdAndRemindType(WaitRemind waitRemind);
+    //删除项目所有待办
+    public int deleteWaitRemindByLoanApplicationIdOnly(WaitRemind waitRemind);
 
     /**
      * 批量删除待办提醒

ruoyi-system/src/main/java/com/ruoyi/system/service/Task.java

@@ -17,10 +17,8 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.time.LocalDate;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Component
 public class Task {
@@ -67,7 +65,7 @@ public class Task {
                                 waitRemind.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
                                 waitRemind.setRemindTitle("您有一条【" + loanApplication.getEnterpriseName() + "】的信息需要进行多次保后");
                                 waitRemind.setRemindTime(DateUtils.getNowDate());
-                                waitRemind.setRemindType("12");
+                                waitRemind.setRemindType("13");
                                 waitRemind.setReadUserId(loanApplication.getfUserId().toString());
                                 waitRemind.setRemindContent(loanApplication.getEnterpriseName() + "有一条贷款申请进入多次保后阶段需及时处理");
                                 waitRemindMapper.insertWaitRemind(waitRemind);
@@ -91,7 +89,7 @@ public class Task {
                     waitRemind.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
                     waitRemind.setRemindTitle("您有一条【" + loanApplication.getEnterpriseName() + "】的信息需要进行保后");
                     waitRemind.setRemindTime(DateUtils.getNowDate());
-                    waitRemind.setRemindType("12");
+                    waitRemind.setRemindType("13");
                     waitRemind.setReadUserId(loanApplication.getfUserId().toString());
                     waitRemind.setRemindContent(loanApplication.getEnterpriseName() + "有一条贷款申请进入保后阶段需及时处理");
                     waitRemindMapper.insertWaitRemind(waitRemind);

ruoyi-system/src/main/java/com/ruoyi/system/service/conference/impl/SysUserConferenceServiceImpl.java

@@ -1,18 +1,13 @@
 package com.ruoyi.system.service.conference.impl;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDictData;
-import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.jPush.JPushToolUtil;
-import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.domain.conference.SysUserConference;
 import com.ruoyi.system.domain.loan.LoanApplication;
 import com.ruoyi.system.domain.remind.WaitRemind;
@@ -26,6 +21,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.ruoyi.common.constant.CommonConstants.*;
 
@@ -180,7 +177,7 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
                 waitRemind.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
                 waitRemind.setRemindTitle("您有一条【" + loanApplication.getEnterpriseName() + "】评审会议");
                 waitRemind.setRemindTime(DateUtils.getNowDate());
-                waitRemind.setRemindType("11");
+                waitRemind.setRemindType("12");
                 waitRemind.setReadUserId(sysUser.getUserId().toString());
                 waitRemind.setRemindContent("您有一个评审会议需参加，会议时间："+sysUserConference.getConferenceTime()+"，会议主题：【"+loanApplication.getEnterpriseName()+"】评审会");
                 waitRemindMapper.insertWaitRemind(waitRemind);

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

@@ -129,7 +129,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         delete from wait_remind where loan_application_id = #{loanApplicationId} and read_user_id = #{readUserId}
     </delete>
     <delete id="deleteWaitRemindByLoanApplicationId" parameterType="WaitRemind">
+        delete from wait_remind where loan_application_id = #{loanApplicationId} and read_user_id = #{readUserId} and remind_type = #{remindType}
+    </delete>
+    <delete id="deleteWaitRemindByLoanApplicationIdAndRemindType" parameterType="WaitRemind">
         delete from wait_remind where loan_application_id = #{loanApplicationId} and read_user_id = #{readUserId} and remind_type != #{remindType}
+    </delete>
 
+    <delete id="deleteWaitRemindByLoanApplicationIdOnly" parameterType="WaitRemind">
+        delete from wait_remind where loan_application_id = #{loanApplicationId}
     </delete>
 </mapper>