From 007055b80677a53598c501553b4265ecd1ace3ca Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期六, 07 十一月 2026 14:08:21 +0800
Subject: [PATCH] fix: 任务组及时率不再叠加 send_day
---
ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml b/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml
index c28c13e..9b29291 100644
--- a/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml
+++ b/ruoyi-task/src/main/resources/mapper/task/ServiceSubtaskMapper.xml
@@ -944,7 +944,7 @@
1) 闈炰换鍔$粍(appltype != 5)锛歟ndtime + send_day(缂虹渷1) + 危琛ュ伩澶╂暟 + 1 澶╋紱
2) 浠诲姟缁�(appltype = 5)锛氭寜 schedule_benchmark 瑙f瀽鍩哄噯鏃堕棿
(1-鍏ラ櫌鏃堕棿 2-鍑洪櫌鏃堕棿 3-灏辫瘖鏃堕棿 4-鍏ョ粍鏃堕棿 0/鍏跺畠-鑷畾涔夋椂闂�)
- + day_offset + send_day(缂虹渷1) + 危琛ュ伩澶╂暟 + 1 澶╋紱
+ + day_offset + 危琛ュ伩澶╂暟 + 1 澶╋紙涓嶅啀鍙犲姞 send_day锛夛紱
瀹屾垚鏃堕棿 finishtime <= 鍩哄噯鏃堕棿璁′负鍙婃椂锛屽垎姣嶄粛涓哄簲闅忚鏁般��
琛ュ伩澶╂暟鍙彇 service_subtask_preachform.compensate_time 鐨勬眹鎬诲�间竴娆★紝
閬垮厤涓庤ˉ鍋挎槑缁嗙浉鍔犻�犳垚閲嶅琛ュ伩鎴栦竴瀵瑰鏀惧ぇ鍒嗘瘝銆� -->
@@ -961,7 +961,6 @@
AND std.day_offset IS NOT NULL
AND ss.finishtime <= DATE_ADD(
DATE_ADD(
- DATE_ADD(
CASE sts.schedule_benchmark
WHEN 1 THEN ss.starttime
WHEN 2 THEN ss.endtime
@@ -969,7 +968,6 @@
WHEN 4 THEN ss.create_time
ELSE sts.schedule_benchmark_custom_time
END, INTERVAL std.day_offset DAY),
- INTERVAL COALESCE(st.send_day, 1) DAY),
INTERVAL (COALESCE(cp.compensate_days, 0) + 1) DAY)
THEN 1
ELSE 0
--
Gitblit v1.9.3