diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java index 905a6e6..0b97b33 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/assigntasksinfo/AssignTasksInfoDO.java @@ -117,5 +117,7 @@ public class AssignTasksInfoDO extends BaseDO { * 是否打回0:正常 1:打回 */ private Integer isReject; + /*是否发送成功 0:未发送 1:已发送*/ + private Integer remindStatue; } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/job/task/ExpireRemindJob.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/job/task/ExpireRemindJob.java index fc09da7..52f4560 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/job/task/ExpireRemindJob.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/job/task/ExpireRemindJob.java @@ -85,7 +85,7 @@ public class ExpireRemindJob implements Job { executeRemindLogic(task); // 4. 提醒成功后,更新任务状态+移除触发器(核心优化:成功也移除) - //updateTaskRemindStatus(taskId); + updateTaskRemindStatus(taskId); removeRemindJobSafely(taskId); log.info("【到期提醒Job】执行成功,任务ID:{}", taskId); @@ -136,7 +136,7 @@ public class ExpireRemindJob implements Job { private void updateTaskRemindStatus(Long taskId) { try { // 实际业务:更新数据库中任务的提醒状态(如remind_status=1 表示已提醒) - //assignTasksInfoService.updateRemindStatus(taskId, 1); + assignTasksInfoService.updateRemindStatus(taskId, 1); log.debug("【到期提醒Job】更新任务提醒状态成功,任务ID:{}", taskId); } catch (Exception e) { // 状态更新失败单独捕获,不影响触发器移除 diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoService.java index 90d5867..79408bb 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoService.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoService.java @@ -121,4 +121,11 @@ public interface AssignTasksInfoService { * @Return void */ public void createRemindJob(LocalDateTime deadline, Long id); + + /** + * @Author wangqian + * @Description 更新发送标识 + * @Return void + */ + public void updateRemindStatus(Long taskId,int remindStatue); } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java index a7c7cd2..c7cd466 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/assigntasksinfo/AssignTasksInfoServiceImpl.java @@ -219,6 +219,14 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { } @Override + public void updateRemindStatus(Long taskId, int remindStatue) { + AssignTasksInfoDO assignTasksInfoDO = new AssignTasksInfoDO(); + assignTasksInfoDO.setId(taskId); + assignTasksInfoDO.setRemindStatue(remindStatue); + assignTasksInfoMapper.updateById(assignTasksInfoDO); + } + + @Override public List getAssignTasksInfos(Long taskId) { if (taskId == null) { throw exception(ASSIGN_TASKS_INFO_TASKID_NOT_EXISTS); @@ -402,6 +410,10 @@ public class AssignTasksInfoServiceImpl implements AssignTasksInfoService { if (user == null || user.getDeptId() == null) { return false; } + // 过滤停用 + if (1 == user.getStatus()) { + return false; + } // 安全比较companyId和deptId(兼容null) return Objects.equals(companyId, user.getDeptId()); })