陈昶聿
17 分钟以前 b1b1b15bbf4fd5a4ed21efa91279227fc915e960
ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml
@@ -286,21 +286,44 @@
           其余(含 delay 为 0 或 NULL、或已超出延期窗口)          -> 3 超时完成
         finishtime 为空时用 NOW() 兜底,保证完成时一定写入状态;
         base 为空(endtime / schedule / day_offset 缺失)时保持原值不覆盖。 -->
    <!-- 2026-11-16 修复:
         MySQL 的 JOIN ... ON 只能引用当前 JOIN 里出现过的表,不能引用外层 UPDATE 的
         service_subtask;原写法 ON st.taskid = service_subtask.taskid 会报
         Unknown column 'service_subtask.taskid' in 'on clause'。
         相关标量子查询的 WHERE 可以正常引用外层 UPDATE 行,所以把三张关联表改成
         标量子查询;关联不到时返回 NULL,与原先 LEFT JOIN 未命中的结果一致。
         LIMIT 1 仅用于兼容 taskid / schedule_id 理论上不唯一的历史数据。 -->
    <sql id="finishDeadlineExpr">
        DATE_ADD(
        CASE
            WHEN COALESCE(st.appltype, '') = '5' THEN
            WHEN COALESCE((SELECT st.appltype
                           FROM service_task st
                           WHERE st.taskid = service_subtask.taskid
                           LIMIT 1), '') = '5' THEN
                DATE_ADD(
                CASE sts.schedule_benchmark
                CASE (SELECT sts.schedule_benchmark
                      FROM service_task_schedule sts
                      WHERE sts.id = service_subtask.schedule_id
                      LIMIT 1)
                    WHEN 1 THEN service_subtask.starttime
                    WHEN 2 THEN service_subtask.endtime
                    WHEN 3 THEN service_subtask.admindate
                    WHEN 4 THEN service_subtask.create_time
                    ELSE sts.schedule_benchmark_custom_time
                    ELSE (SELECT sts.schedule_benchmark_custom_time
                          FROM service_task_schedule sts
                          WHERE sts.id = service_subtask.schedule_id
                          LIMIT 1)
                END,
                INTERVAL std.day_offset DAY)
                INTERVAL (SELECT std.day_offset
                          FROM service_task_schedule_detail std
                          WHERE std.id = service_subtask.schedule_detail_id
                          LIMIT 1) DAY)
            ELSE
                DATE_ADD(service_subtask.endtime, INTERVAL COALESCE(st.send_day, 1) DAY)
                DATE_ADD(service_subtask.endtime,
                         INTERVAL COALESCE((SELECT st.send_day
                                           FROM service_task st
                                           WHERE st.taskid = service_subtask.taskid
                                           LIMIT 1), 1) DAY)
        END,
        INTERVAL (COALESCE((SELECT SUM(CAST(COALESCE(NULLIF(TRIM(pf.compensate_time), ''), '0') AS SIGNED))
        FROM service_subtask_preachform pf
@@ -308,26 +331,26 @@
    </sql>
    <sql id="finishStateExpr">
        COALESCE((
        SELECT
        COALESCE(
        CASE
        WHEN <include refid="finishDeadlineExpr"/> IS NULL THEN NULL
        WHEN COALESCE(#{finishtime,jdbcType=TIMESTAMP}, service_subtask.finishtime, NOW())
        &lt;= <include refid="finishDeadlineExpr"/>
        THEN 1
        WHEN COALESCE(st.delay_finish_days, 0) &gt; 0
        WHEN COALESCE((SELECT st.delay_finish_days
                       FROM service_task st
                       WHERE st.taskid = service_subtask.taskid
                       LIMIT 1), 0) &gt; 0
        AND COALESCE(#{finishtime,jdbcType=TIMESTAMP}, service_subtask.finishtime, NOW())
        &lt;= DATE_ADD(<include refid="finishDeadlineExpr"/>,
        INTERVAL COALESCE(st.delay_finish_days, 0) DAY)
        INTERVAL COALESCE((SELECT st.delay_finish_days
                           FROM service_task st
                           WHERE st.taskid = service_subtask.taskid
                           LIMIT 1), 0) DAY)
        THEN 2
        ELSE 3
        END
        FROM (SELECT 1) dummy
        LEFT JOIN service_task st ON st.taskid = service_subtask.taskid
        LEFT JOIN service_task_schedule sts ON sts.id = service_subtask.schedule_id
        LEFT JOIN service_task_schedule_detail std ON std.id = service_subtask.schedule_detail_id
        LIMIT 1
        ), finish_state)
        , finish_state)
    </sql>
    <!-- 当前执行方式:首次随访 current_preachform 为空时,取 preachform 的第一个执行方式兜底 -->