suzhou-jichuang-lanhai
/
JinJiHuJava
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

正式环境正常的用户才会收到短信

Browse Source
wushunjie
杜函宇 6 months ago
parent 442e9873c7
commit fa26e862d8
4 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File

38
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/component/TimingRemindImpl.java
Unescape View File

@ -107,27 +107,29 @@ public class TimingRemindImpl implements TimingRemindService {
//添加用户进表的时候手机号已经经过处理 //添加用户进表的时候手机号已经经过处理
SysUser user = new SysUser(); SysUser user = new SysUser();
user.setUserType("02"); user.setUserType("02");
sysUserMapper.selectUserList(user).forEach(x -> { for (SysUser x : sysUserMapper.selectUserList(user)) {
JSmartDeclaration sd = new JSmartDeclaration(); if("0".equals(x.getDelFlag()) & "0".equals(x.getStatus())){
sd.setIsRead(1); JSmartDeclaration sd = new JSmartDeclaration();
sd.setAlertTime(LocalDateTime.parse(t)); sd.setIsRead(1);
sd.setSmartRemindersId(id); sd.setAlertTime(LocalDateTime.parse(t));
if ("null".equals(pid)) { sd.setSmartRemindersId(id);
sd.setProjectId(null); if ("null".equals(pid)) {
} else { sd.setProjectId(null);
sd.setProjectId(Long.valueOf(pid)); } 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());
} }
if (!x.getPhonenumber().isEmpty() & sd.getProjectId() == null) { sd.setZwId(x.getUserId());
smsAlertsService.enterSms("政府人员-" + x.getNickName(), "您有1个全局自定义通知,请前往工作台查看", x.getPhonenumber()); 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); jSmartDeclarationService.saveBatch(listAdd);
} }
} }

12
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/SmsEnterChange.java
Unescape View File

@ -47,7 +47,9 @@ public class SmsEnterChange {
List<SysUser> list1 = sysUserMapper.selectUserList(user); List<SysUser> list1 = sysUserMapper.selectUserList(user);
list1.removeIf(x -> x.getPhonenumber().isEmpty()); list1.removeIf(x -> x.getPhonenumber().isEmpty());
for (SysUser items : list1) { 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<SysUser> list2 = sysUserMapper.selectUserList(user1); List<SysUser> list2 = sysUserMapper.selectUserList(user1);
list2.removeIf(x -> x.getPhonenumber().isEmpty()); list2.removeIf(x -> x.getPhonenumber().isEmpty());
for (SysUser items : list2) { 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<SysUser> list3 = sysUserMapper.selectUserList(user2); List<SysUser> list3 = sysUserMapper.selectUserList(user2);
list3.removeIf(x -> x.getPhonenumber().isEmpty()); list3.removeIf(x -> x.getPhonenumber().isEmpty());
for (SysUser items : list3) { 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());
}
} }
} }
} }

24
ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java
Unescape View File

@ -281,18 +281,20 @@ public class TimeChange {
jp.forEach(x -> { jp.forEach(x -> {
SysUser user = new SysUser(); SysUser user = new SysUser();
user.setUserType("02"); user.setUserType("02");
sysUserMapper.selectUserList(user).forEach(o -> { for (SysUser o : sysUserMapper.selectUserList(user)) {
JSmartDeclaration y = new JSmartDeclaration(); if("0".equals(o.getDelFlag()) & "0".equals(o.getStatus())) {
y.setSmartRemindersId(2L); JSmartDeclaration y = new JSmartDeclaration();
y.setIsRead(1); y.setSmartRemindersId(2L);
y.setAlertTime(x.getProjectEndTime().minusDays(zw.getDaysAdvance())); y.setIsRead(1);
y.setProjectId(x.getId()); y.setAlertTime(x.getProjectEndTime().minusDays(zw.getDaysAdvance()));
y.setZwId(o.getUserId()); y.setProjectId(x.getId());
bmsDeclarationRecords.add(y); y.setZwId(o.getUserId());
if (isTiming) { bmsDeclarationRecords.add(y);
smsAlertsService.enterSms("政府人员-" + o.getNickName(), "您有1个项目即将建设完成,请前往工作台查看。", o.getPhonenumber()); if (isTiming) {
smsAlertsService.enterSms("政府人员-" + o.getNickName(), "您有1个项目即将建设完成,请前往工作台查看。", o.getPhonenumber());
}
} }
}); }
}); });
jSmartDeclarationService.saveBatch(bmsDeclarationRecords); jSmartDeclarationService.saveBatch(bmsDeclarationRecords);
} }

1
ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JEnterpriseContactController.java
Unescape View File

@ -66,7 +66,6 @@ public class JEnterpriseContactController extends BaseController {
} catch (Exception ignored) { } catch (Exception ignored) {
} }
if (!admin && b) { if (!admin && b) {
jEnterpriseContactRequest.setEnterpriseName(str.getNickName());
jEnterpriseContactRequest.setEnterpriseCode(str.getUserName()); jEnterpriseContactRequest.setEnterpriseCode(str.getUserName());
} }
if (page.getCurrent() >= 1 & page.getSize() >= 1) { if (page.getCurrent() >= 1 & page.getSize() >= 1) {

Write Preview
Loading…
Cancel
Save