From 451f90330af5b9fd036e1edbefe5444fb2ab1311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E9=94=90=E6=B3=A2?=
 <10549902+zhuangruibo@user.noreply.gitee.com>
Date: Sun, 31 May 2026 17:13:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quartz/job/CpNoticeAutoCompleteJob.java   | 29 +++++++++++++++
 .../quartz/job/CpPlanDeadlineGenTaskJob.java  | 35 +++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/quartz/job/CpNoticeAutoCompleteJob.java
 create mode 100644 zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/quartz/job/CpPlanDeadlineGenTaskJob.java

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/quartz/job/CpNoticeAutoCompleteJob.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/quartz/job/CpNoticeAutoCompleteJob.java
new file mode 100644
index 00000000..b3a03110
--- /dev/null
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/quartz/job/CpNoticeAutoCompleteJob.java
@@ -0,0 +1,29 @@
+package com.zdxt.enforcementcode.quartz.job;
+
+import com.zdxt.enforcementcode.service.IEfcodeCpNoticeService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 预告到期自动标记已执行 - 定时任务
+ * <p>扫描已发布的预告，当 enforce_date 23:59:59 < 当前时间时，自动将状态更新为 3=已执行</p>
+ *
+ * @author zrb
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class CpNoticeAutoCompleteJob {
+
+    private final IEfcodeCpNoticeService cpNoticeService;
+
+    /**
+     * 任务执行入口（public，供 JobInvokeUtil 通过反射调用）
+     */
+    public void execute() {
+        log.info("[CpNoticeAutoCompleteJob] 定时任务触发：预告到期自动标记已执行");
+        int count = cpNoticeService.markExpiredNoticesAsExecuted();
+        log.info("[CpNoticeAutoCompleteJob] 执行完成：共标记{}条预告为已执行", count);
+    }
+}
diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/quartz/job/CpPlanDeadlineGenTaskJob.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/quartz/job/CpPlanDeadlineGenTaskJob.java
new file mode 100644
index 00000000..758735ac
--- /dev/null
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/quartz/job/CpPlanDeadlineGenTaskJob.java
@@ -0,0 +1,35 @@
+package com.zdxt.enforcementcode.quartz.job;
+
+import com.zdxt.enforcementcode.service.IEfcodeCpPlanService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 计划到期自动生成任务 - 定时任务
+ * <p>距计划执行日期 <= CP_SETTING_MANUAL_MATCH_DAYS 天时，
+ * 系统自动取消剩余未处理的预约（含系统匹配与手动预约），并为计划生成任务。</p>
+ * <ul>
+ *   <li>部分联合（有已同意的预约）：取消剩余待确认预约，已同意的计划共享生成任务</li>
+ *   <li>完全没有联合记录：直接为计划生成任务</li>
+ *   <li>全部待确认（无人同意）：取消全部待确认预约，为每个计划各自生成任务</li>
+ * </ul>
+ *
+ * @author zrb
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class CpPlanDeadlineGenTaskJob {
+
+    private final IEfcodeCpPlanService cpPlanService;
+
+    /**
+     * 任务执行入口（public，供 JobInvokeUtil 通过反射调用）
+     */
+    public void execute() {
+        log.info("[CpPlanDeadlineGenTaskJob] 定时任务触发：计划到期自动生成任务");
+        int count = cpPlanService.processPlanDeadlineAutoGenTask();
+        log.info("[CpPlanDeadlineGenTaskJob] 执行完成：共处理{}条计划", count);
+    }
+}