fix 新增待办操作记录

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

@@ -459,44 +459,47 @@ 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 (rows > 0) {
+            //查询审核管理员用户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);
+            //插入审核通过的待办提醒
+            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();
     }
 
@@ -720,10 +723,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);
+        waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);*/
         List<LoanApplicationFj> fjUrl = reviewComments.getFjUrl();
         if (fjUrl != null && fjUrl.size() > 0) {
             StringBuilder type = new StringBuilder();
@@ -812,8 +815,16 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                     waitRemindList.add(waitRemindManager);
                 }
             }
+            //插入待办
             waitRemindMapper.batchWaitRemind(waitRemindList);
 
+            WaitRemind waitRemindIsRead = new WaitRemind();
+            waitRemindIsRead.setLoanApplicationId(loanApplicationId);
+            waitRemindIsRead.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+            waitRemindIsRead.setRemindType(ONE);
+            //把上一阶段的待办都设置为已读
+            waitRemindMapper.updateWaitRemindIsRead(waitRemindIsRead);
+
             //发极光推送id
             //获取所有的userid
             userIdList.add(loanApplication.getaUserId());
@@ -866,7 +877,12 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 }
             }
             waitRemindMapper.batchWaitRemind(waitRemindList);
-
+            //把上一阶段的待办都设置为已读
+            WaitRemind waitRemindIsRead = new WaitRemind();
+            waitRemindIsRead.setLoanApplicationId(loanApplicationId);
+            waitRemindIsRead.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+            waitRemindIsRead.setRemindType(ONE);
+            waitRemindMapper.updateWaitRemindIsRead(waitRemindIsRead);
             //发极光推送id
             //获取所有的userid
             userIdList.add(loanApplication.getaUserId());
@@ -999,7 +1015,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 loanApplication.setAuditSchedule(String.valueOf(Integer.parseInt(auditSchedule) + 1));
                 loanApplication.setAuditType(ONE);
 
-                if (auditSchedule.equals(FOR)){
+                if (auditSchedule.equals(FOR)) {
                     //给初审风险合规 状态下的风险发送
                     WaitRemind waitRemindf = new WaitRemind();
                     waitRemindf.setLoanApplicationId(loanApplicationId);
@@ -1050,6 +1066,12 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             if (waitRemindList.size() > 0) {
                 waitRemindMapper.batchWaitRemind(waitRemindList);
 
+                //把上一阶段的待办都设置为已读
+                WaitRemind waitRemindIsRead = new WaitRemind();
+                waitRemindIsRead.setLoanApplicationId(loanApplicationId);
+                waitRemindIsRead.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+                waitRemindIsRead.setRemindType(String.valueOf(Integer.parseInt(waitRemindList.get(0).getRemindType()) - 1));
+                waitRemindMapper.updateWaitRemindIsRead(waitRemindIsRead);
                 //发极光推送id
                 List<SysUser> sysUsers = sysUserService.selectUserListByIdList(userIdList);
                 if (sysUsers != null && sysUsers.size() > 0) {
@@ -1171,37 +1193,47 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             return AjaxResult.error("当前项目状态异常，不允许上会");
         }
         int rows = loanApplicationMapper.updateLoanApplication(loanApplication);
-        //删除所有状态小于的待办事项
+/*        //删除所有状态小于的待办事项
         WaitRemind waitRemindDelete = new WaitRemind();
         waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
         //删除所有待办
-        waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
+        waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);*/
         //给A角色发送上会审核信息
-        WaitRemind waitRemindManager = new WaitRemind();
-        waitRemindManager.setLoanApplicationId(loanApplication.getLoanApplicationId());
-        waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
-        waitRemindManager.setRemindTitle("有一条【" + loanApplication.getEnterpriseName() + "】的上会审核信息");
-        waitRemindManager.setRemindTime(DateUtils.getNowDate());
-        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);
-
-        //发极光推送
-        SysUser user = sysUserService.selectUserById(loanApplication.getaUserId());
-        if (StringUtils.isNotEmpty(user.getJgId())) {
-            String notificationTitle = "消息通知";
-            String msgTitle = "上会审核信息";
-            String msgContent = loanApplication.getEnterpriseName() + "的上会审核信息申请" + result;
-            String jPushVO = "";
-            JPushToolUtil.sendToRegistrationId(notificationTitle, msgTitle, msgContent, jPushVO, user.getJgId());
+        if (rows > 0) {
+            //把上一阶段的待办都设置为已读
+            WaitRemind waitRemindIsRead = new WaitRemind();
+            waitRemindIsRead.setLoanApplicationId(loanApplication.getLoanApplicationId());
+            waitRemindIsRead.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+            waitRemindIsRead.setRemindType(SEV);
+            waitRemindMapper.updateWaitRemindIsRead(waitRemindIsRead);
+
+            WaitRemind waitRemindManager = new WaitRemind();
+            waitRemindManager.setLoanApplicationId(loanApplication.getLoanApplicationId());
+            waitRemindManager.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+            waitRemindManager.setRemindTitle("有一条【" + loanApplication.getEnterpriseName() + "】的上会审核信息");
+            waitRemindManager.setRemindTime(DateUtils.getNowDate());
+            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);
+            //把上一阶段的待办都设置为已读
+            waitRemindIsRead.setRemindType(SIX);
+            waitRemindMapper.updateWaitRemindIsRead(waitRemindIsRead);
+            //发极光推送
+            SysUser user = sysUserService.selectUserById(loanApplication.getaUserId());
+            if (StringUtils.isNotEmpty(user.getJgId())) {
+                String notificationTitle = "消息通知";
+                String msgTitle = "上会审核信息";
+                String msgContent = loanApplication.getEnterpriseName() + "的上会审核信息申请" + result;
+                String jPushVO = "";
+                JPushToolUtil.sendToRegistrationId(notificationTitle, msgTitle, msgContent, jPushVO, user.getJgId());
+            }
         }
-
         return rows > 0 ? AjaxResult.success() : AjaxResult.error();
     }
 
@@ -1246,10 +1278,10 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             application.setAuditSchedule(TEN);
         }
         loanApplicationMapper.updateLoanApplication(application);
-        //删除所有状态小于的待办事项
+/*        //删除所有状态小于的待办事项
         WaitRemind waitRemindDelete = new WaitRemind();
         waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-        waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
+        waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);*/
 
         WaitRemind waitRemind = new WaitRemind();
         waitRemind.setLoanApplicationId(loanApplication.getLoanApplicationId());
@@ -1280,7 +1312,12 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             }
         }
         waitRemindMapper.batchWaitRemind(waitRemindList);
-
+        //把上一阶段的待办都设置为已读
+        WaitRemind waitRemindIsRead = new WaitRemind();
+        waitRemindIsRead.setLoanApplicationId(loanApplication.getLoanApplicationId());
+        waitRemindIsRead.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+        waitRemindIsRead.setRemindType(String.valueOf(Integer.parseInt(application.getAuditSchedule()) - 1));
+        waitRemindMapper.updateWaitRemindIsRead(waitRemindIsRead);
         //发极光推送id
         userIdList.add(loanApplication.getaUserId());
         List<SysUser> sysUsers = sysUserService.selectUserListByIdList(userIdList);
@@ -1336,10 +1373,11 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         if (Integer.parseInt(loanSchedule) < 2 || Integer.parseInt(auditSchedule) < 1 || Integer.parseInt(loanApplicationType) != 2) {
             return AjaxResult.error("当前项目不可撤销");
         }
-        //删除所有待办事项
+        //删除所有当前未操作的待办事项 删除当前remind_type and isRead = N 未操作
         WaitRemind waitRemindDelete = new WaitRemind();
         waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-        waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
+        waitRemindDelete.setRemindType(auditSchedule);
+        waitRemindMapper.deleteWaitRemindByLoanApplicationIdAndIsRead(waitRemindDelete);
         if (Integer.parseInt(loanSchedule) > 7) {
             //撤销只返回贷款申请进度到上一步
             loanApplication.setLoanSchedule(String.valueOf(Integer.parseInt(loanSchedule) - 1));
@@ -1423,7 +1461,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             waitRemindList.add(waitRemind);
             userIdList.add(loanApplicationOld.getaUserId());
             //如果退回到初审风险合规  给风险发送待办
-            if (loanApplication.getAuditSchedule().equals(FIV)){
+            if (loanApplication.getAuditSchedule().equals(FIV)) {
                 WaitRemind waitRemindf = new WaitRemind();
                 waitRemindf.setLoanApplicationId(loanApplicationId);
                 waitRemindf.setLoanApplicationNumber(loanApplicationNumber);
@@ -1455,21 +1493,28 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         }
         loanApplicationMapper.updateLoanApplication2(loanApplication);
 
-        //插入待办事项
-        waitRemindMapper.batchWaitRemind(waitRemindList);
-
-        //极光推送
-        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);
+        if (waitRemindList.size() > 0){
+            //插入待办事项
+            waitRemindMapper.batchWaitRemind(waitRemindList);
+            //把上一阶段的待办都设置为已读
+            WaitRemind waitRemindIsRead = new WaitRemind();
+            waitRemindIsRead.setLoanApplicationId(loanApplication.getLoanApplicationId());
+            waitRemindIsRead.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+            waitRemindIsRead.setRemindType(String.valueOf(Integer.parseInt(waitRemindList.get(0).getRemindType()) - 1));
+            waitRemindMapper.updateWaitRemindIsRead(waitRemindIsRead);
+            //极光推送
+            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);
+                }
             }
         }
 
@@ -1668,10 +1713,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.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
+        waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);*/
         return AjaxResult.success();
     }
 
@@ -1683,10 +1728,10 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
      */
     @Override
     public AjaxResult zanHuan(LoanApplication loanApplication) {
-        //删除所有状态小于的待办事项
+/*        //删除所有状态小于的待办事项
         WaitRemind waitRemindDelete = new WaitRemind();
         waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-        waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
+        waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);*/
         WaitRemind waitRemind = new WaitRemind();
         waitRemind.setLoanApplicationId(loanApplication.getLoanApplicationId());
         waitRemind.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
@@ -1715,6 +1760,12 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 waitRemindRole.setRemindContent(loanApplication.getRemark());
                 waitRemindMapper.insertWaitRemind(waitRemindRole);
             }
+            //把上一阶段的待办都设置为已读
+            WaitRemind waitRemindIsRead = new WaitRemind();
+            waitRemindIsRead.setLoanApplicationId(loanApplication.getLoanApplicationId());
+            waitRemindIsRead.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+            waitRemindIsRead.setRemindType(EIG);
+            waitRemindMapper.updateWaitRemindIsRead(waitRemindIsRead);
             //发极光推送id
             //获取所有的userid
             List<Long> userIdList = sysUserRoles.stream().map(SysUserRole::getUserId).collect(Collectors.toList());

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

@@ -47,6 +47,7 @@ public interface WaitRemindMapper
      * @return 结果
      */
     public int updateWaitRemind(WaitRemind waitRemind);
+    public int updateWaitRemindIsRead(WaitRemind waitRemind);
 
     /**
      * 删除待办提醒
@@ -61,6 +62,7 @@ public interface WaitRemindMapper
     public int deleteWaitRemindByLoanApplicationIdAndRemindType(WaitRemind waitRemind);
     //删除项目所有待办
     public int deleteWaitRemindByLoanApplicationIdOnly(WaitRemind waitRemind);
+    public int deleteWaitRemindByLoanApplicationIdAndIsRead(WaitRemind waitRemind);
 
     /**
      * 批量删除待办提醒

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

@@ -378,10 +378,10 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
             List<WaitRemind> waitRemindList = new ArrayList<>();
             LoanApplication loanApplicationOld = loanApplicationMapper.selectLoanApplicationByLoanApplicationId(sysUserConference.getLoanApplicationId());
             //发送待办消息
-            //删除所有待办事项
+/*            //删除所有待办事项
             WaitRemind waitRemindDelete = new WaitRemind();
             waitRemindDelete.setLoanApplicationId(loanApplication.getLoanApplicationId());
-            waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);
+            waitRemindMapper.deleteWaitRemindByLoanApplicationIdOnly(waitRemindDelete);*/
             //给A发送待办消息
             WaitRemind waitRemind = new WaitRemind();
             waitRemind.setLoanApplicationId(loanApplicationOld.getLoanApplicationId());
@@ -399,6 +399,13 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
 
             //插入待办事项
             waitRemindMapper.batchWaitRemind(waitRemindList);
+
+            //把上一阶段的待办都设置为已读
+            WaitRemind waitRemindIsRead = new WaitRemind();
+            waitRemindIsRead.setLoanApplicationId(loanApplication.getLoanApplicationId());
+            waitRemindIsRead.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+            waitRemindIsRead.setRemindType(String.valueOf(Integer.parseInt(loanApplication.getAuditSchedule()) - 1));
+            waitRemindMapper.updateWaitRemindIsRead(waitRemindIsRead);
             //发极光推送id
             List<SysUser> sysUsers = sysUserService.selectUserListByIdList(userIdList);
             if (sysUsers != null && sysUsers.size() > 0) {

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

@@ -115,6 +115,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where remind_id = #{remindId}
     </update>
 
+    <update id="updateWaitRemindIsRead" parameterType="WaitRemind">
+        update wait_remind set is_read = 'Y'
+        where loan_application_id = #{loanApplicationId} and loan_application_number = #{loanApplicationNumber} and remind_type = #{remindType}
+    </update>
     <delete id="deleteWaitRemindByRemindId" parameterType="Integer">
         delete from wait_remind where remind_id = #{remindId}
     </delete>
@@ -138,4 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="deleteWaitRemindByLoanApplicationIdOnly" parameterType="WaitRemind">
         delete from wait_remind where loan_application_id = #{loanApplicationId}
     </delete>
+    <delete id="deleteWaitRemindByLoanApplicationIdAndIsRead" parameterType="WaitRemind">
+        delete from wait_remind where loan_application_id = #{loanApplicationId} and remind_type = #{remindType}  and is_read = 'N'
+    </delete>
 </mapper>