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