From 7db0ad56c1287d6703035539a7f453eadeec1824 Mon Sep 17 00:00:00 2001 From: JinYong Li <42576980+JinyLeeChina@users.noreply.github.com> Date: Tue, 27 Sep 2022 15:22:36 +0800 Subject: [PATCH] fix complement data bug (#12162) Co-authored-by: JinyLeeChina --- .../common/utils/placeholder/BusinessTimeUtils.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/BusinessTimeUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/BusinessTimeUtils.java index 7c2d2318a8..f5bced3e91 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/BusinessTimeUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/BusinessTimeUtils.java @@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.common.utils.placeholder; import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.common.enums.CommandType; +import org.apache.dolphinscheduler.spi.utils.DateUtils; import java.util.Date; import java.util.HashMap; @@ -46,13 +47,11 @@ public class BusinessTimeUtils { * @return business time */ public static Map getBusinessTime(CommandType commandType, Date runTime) { - Date businessDate = runTime; - Map result = new HashMap<>(); + Date businessDate; switch (commandType) { case COMPLEMENT_DATA: - if (runTime == null) { - return result; - } + businessDate = DateUtils.addDays(runTime, -1); + break; case START_PROCESS: case START_CURRENT_TASK_PROCESS: case RECOVER_TOLERANCE_FAULT_PROCESS: @@ -71,6 +70,7 @@ public class BusinessTimeUtils { break; } Date businessCurrentDate = addDays(businessDate, 1); + Map result = new HashMap<>(); result.put(Constants.PARAMETER_CURRENT_DATE, format(businessCurrentDate, PARAMETER_FORMAT_DATE)); result.put(Constants.PARAMETER_BUSINESS_DATE, format(businessDate, PARAMETER_FORMAT_DATE)); result.put(Constants.PARAMETER_DATETIME, format(businessCurrentDate, PARAMETER_FORMAT_TIME));