admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

危大工程在施危大工程上传旁站记录等提醒bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-07-24 18:52:57 +08:00
parent 8de4e31035
commit 7846943f93
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/zhgd/xmgl/task/DangerousEngineeringRecordTask.java
View File

@ -3,7 +3,6 @@ package com.zhgd.xmgl.task;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zhgd.xmgl.constant.Cts;
import com.zhgd.xmgl.modules.basicdata.service.INoticeService; import com.zhgd.xmgl.modules.basicdata.service.INoticeService;
import com.zhgd.xmgl.modules.basicdata.service.impl.SystemUserServiceImpl; import com.zhgd.xmgl.modules.basicdata.service.impl.SystemUserServiceImpl;
import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringRecord; import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringRecord;
@ -68,24 +67,21 @@ public class DangerousEngineeringRecordTask {
.eq(DangerousEngineeringRecord::getFinalAcceptanceStatus, 1) .eq(DangerousEngineeringRecord::getFinalAcceptanceStatus, 1)
); );
for (DangerousEngineeringRecord record : list) { for (DangerousEngineeringRecord record : list) {
String personLiable = record.getPersonLiable(); Long personLiable = record.getPersonLiableId();
if (StrUtil.isBlank(personLiable)) { if (personLiable == null) {
continue; continue;
} }
List<String> personIds = StrUtil.split(personLiable, Cts.COMMA);
String title1 = "在施危大工程上传旁站记录提醒"; String title1 = "在施危大工程上传旁站记录提醒";
String title2 = "在施危大工程上传排查记录提醒"; String title2 = "在施危大工程上传排查记录提醒";
String msg1 = StrUtil.format("您所负责的{}，计划实施时间为{}至{}已开工，在施危大工程需每日上传旁站记录，请注意及时上传！", record.getEngineeringName(), record.getPlanStartTime(), record.getPlanEndTime()); String msg1 = StrUtil.format("您所负责的{}，计划实施时间为{}至{}已开工，在施危大工程需每日上传旁站记录，请注意及时上传！", record.getEngineeringName(), record.getPlanStartTime(), record.getPlanEndTime());
String msg2 = StrUtil.format("您所负责的{}，计划实施时间为{}至{}已开工，在施危大工程需每日上传排查记录，请注意及时上传！", record.getEngineeringName(), record.getPlanStartTime(), record.getPlanEndTime()); String msg2 = StrUtil.format("您所负责的{}，计划实施时间为{}至{}已开工，在施危大工程需每日上传排查记录，请注意及时上传！", record.getEngineeringName(), record.getPlanStartTime(), record.getPlanEndTime());
for (String personId : personIds) { noticeService.addUserNotice(personLiable, title1,
noticeService.addUserNotice(Long.valueOf(personId), title1,
msg1, "2"); msg1, "2");
noticeService.addUserNotice(Long.valueOf(personId), title2, noticeService.addUserNotice(personLiable, title2,
msg2, "2"); msg2, "2");
} noticeService.addProjectLevelNotice(record.getProjectSn(), title1, systemUserService.getFrameUserNames(String.valueOf(personLiable)) + msg1, "2", null);
noticeService.addProjectLevelNotice(record.getProjectSn(), title1, systemUserService.getFrameUserNames(personLiable) + msg1, "2", null); noticeService.addProjectLevelNotice(record.getProjectSn(), title2, systemUserService.getFrameUserNames(String.valueOf(personLiable)) + msg2, "2", null);
noticeService.addProjectLevelNotice(record.getProjectSn(), title2, systemUserService.getFrameUserNames(personLiable) + msg2, "2", null);
} }
} }