From b1b1b15bbf4fd5a4ed21efa91279227fc915e960 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 16 十一月 2026 16:35:48 +0800
Subject: [PATCH] 【丽水】JOIN报错调整

---
 ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml |   53 ++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml b/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml
index 8d9ff97..93d3c3d 100644
--- a/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml
+++ b/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml
@@ -286,21 +286,44 @@
            鍏朵綑锛堝惈 delay 涓� 0 鎴� NULL銆佹垨宸茶秴鍑哄欢鏈熺獥鍙o級          -> 3 瓒呮椂瀹屾垚
          finishtime 涓虹┖鏃剁敤 NOW() 鍏滃簳锛屼繚璇佸畬鎴愭椂涓�瀹氬啓鍏ョ姸鎬侊紱
          base 涓虹┖锛坋ndtime / 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 鍙互姝e父寮曠敤澶栧眰 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 鐨勭涓�涓墽琛屾柟寮忓厹搴� -->

--
Gitblit v1.9.3