diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/component/TimingRemindImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/component/TimingRemindImpl.java index 37789f8..2b1bb86 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/component/TimingRemindImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/component/TimingRemindImpl.java @@ -107,27 +107,29 @@ public class TimingRemindImpl implements TimingRemindService { //添加用户进表的时候手机号已经经过处理 SysUser user = new SysUser(); user.setUserType("02"); - sysUserMapper.selectUserList(user).forEach(x -> { - JSmartDeclaration sd = new JSmartDeclaration(); - sd.setIsRead(1); - sd.setAlertTime(LocalDateTime.parse(t)); - sd.setSmartRemindersId(id); - if ("null".equals(pid)) { - sd.setProjectId(null); - } else { - sd.setProjectId(Long.valueOf(pid)); - } - sd.setZwId(x.getUserId()); - if (isTiming) { - if (sd.getProjectId() != null & !x.getPhonenumber().isEmpty()) { - smsAlertsService.enterSms("政府人员-" + x.getNickName(), "您有1个项目自定义通知,请前往工作台查看", x.getPhonenumber()); + for (SysUser x : sysUserMapper.selectUserList(user)) { + if("0".equals(x.getDelFlag()) & "0".equals(x.getStatus())){ + JSmartDeclaration sd = new JSmartDeclaration(); + sd.setIsRead(1); + sd.setAlertTime(LocalDateTime.parse(t)); + sd.setSmartRemindersId(id); + if ("null".equals(pid)) { + sd.setProjectId(null); + } else { + sd.setProjectId(Long.valueOf(pid)); } - if (!x.getPhonenumber().isEmpty() & sd.getProjectId() == null) { - smsAlertsService.enterSms("政府人员-" + x.getNickName(), "您有1个全局自定义通知,请前往工作台查看", x.getPhonenumber()); + sd.setZwId(x.getUserId()); + if (isTiming) { + if (sd.getProjectId() != null & !x.getPhonenumber().isEmpty()) { + smsAlertsService.enterSms("政府人员-" + x.getNickName(), "您有1个项目自定义通知,请前往工作台查看", x.getPhonenumber()); + } + if (!x.getPhonenumber().isEmpty() & sd.getProjectId() == null) { + smsAlertsService.enterSms("政府人员-" + x.getNickName(), "您有1个全局自定义通知,请前往工作台查看", x.getPhonenumber()); + } } + listAdd.add(sd); } - listAdd.add(sd); - }); + } jSmartDeclarationService.saveBatch(listAdd); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/SmsEnterChange.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/SmsEnterChange.java index 23c078b..236572e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/SmsEnterChange.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/SmsEnterChange.java @@ -47,7 +47,9 @@ public class SmsEnterChange { List list1 = sysUserMapper.selectUserList(user); list1.removeIf(x -> x.getPhonenumber().isEmpty()); for (SysUser items : list1) { - smsAlertsService.enterSms("政府人员-" + items.getNickName(), "您有" + count + "个新的申报审核任务[待初审]", items.getPhonenumber()); + if("0".equals(items.getDelFlag()) & "0".equals(items.getStatus())) { + smsAlertsService.enterSms("政府人员-" + items.getNickName(), "您有" + count + "个新的申报审核任务[待初审]", items.getPhonenumber()); + } } } //查询复审的所有用户 @@ -58,7 +60,9 @@ public class SmsEnterChange { List list2 = sysUserMapper.selectUserList(user1); list2.removeIf(x -> x.getPhonenumber().isEmpty()); for (SysUser items : list2) { - smsAlertsService.enterSms("政府人员-" + items.getNickName(), "您有" + count1 + "个新的申报审核任务[待复审]", items.getPhonenumber()); + if("0".equals(items.getDelFlag()) & "0".equals(items.getStatus())) { + smsAlertsService.enterSms("政府人员-" + items.getNickName(), "您有" + count1 + "个新的申报审核任务[待复审]", items.getPhonenumber()); + } } } //查询终审的所有用户 @@ -69,7 +73,9 @@ public class SmsEnterChange { List list3 = sysUserMapper.selectUserList(user2); list3.removeIf(x -> x.getPhonenumber().isEmpty()); for (SysUser items : list3) { - smsAlertsService.enterSms("政府人员-" + items.getNickName(), "您有" + count2 + "个新的申报审核任务[待终审]", items.getPhonenumber()); + if("0".equals(items.getDelFlag()) & "0".equals(items.getStatus())) { + smsAlertsService.enterSms("政府人员-" + items.getNickName(), "您有" + count2 + "个新的申报审核任务[待终审]", items.getPhonenumber()); + } } } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java index 21c803a..33327e8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java @@ -281,18 +281,20 @@ public class TimeChange { jp.forEach(x -> { SysUser user = new SysUser(); user.setUserType("02"); - sysUserMapper.selectUserList(user).forEach(o -> { - JSmartDeclaration y = new JSmartDeclaration(); - y.setSmartRemindersId(2L); - y.setIsRead(1); - y.setAlertTime(x.getProjectEndTime().minusDays(zw.getDaysAdvance())); - y.setProjectId(x.getId()); - y.setZwId(o.getUserId()); - bmsDeclarationRecords.add(y); - if (isTiming) { - smsAlertsService.enterSms("政府人员-" + o.getNickName(), "您有1个项目即将建设完成,请前往工作台查看。", o.getPhonenumber()); + for (SysUser o : sysUserMapper.selectUserList(user)) { + if("0".equals(o.getDelFlag()) & "0".equals(o.getStatus())) { + JSmartDeclaration y = new JSmartDeclaration(); + y.setSmartRemindersId(2L); + y.setIsRead(1); + y.setAlertTime(x.getProjectEndTime().minusDays(zw.getDaysAdvance())); + y.setProjectId(x.getId()); + y.setZwId(o.getUserId()); + bmsDeclarationRecords.add(y); + if (isTiming) { + smsAlertsService.enterSms("政府人员-" + o.getNickName(), "您有1个项目即将建设完成,请前往工作台查看。", o.getPhonenumber()); + } } - }); + } }); jSmartDeclarationService.saveBatch(bmsDeclarationRecords); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JEnterpriseContactController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JEnterpriseContactController.java index 91cc6b6..6ecd5c5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JEnterpriseContactController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JEnterpriseContactController.java @@ -66,7 +66,6 @@ public class JEnterpriseContactController extends BaseController { } catch (Exception ignored) { } if (!admin && b) { - jEnterpriseContactRequest.setEnterpriseName(str.getNickName()); jEnterpriseContactRequest.setEnterpriseCode(str.getUserName()); } if (page.getCurrent() >= 1 & page.getSize() >= 1) {