[Fix-18154] Fix abnormal transmission of sub-workflow complement date (#18155)

Author: SbloodyS

dolphinscheduler-extract/dolphinscheduler-extract-master/src/main/java/org/apache/dolphinscheduler/extract/master/transportor/workflow/WorkflowManualTriggerRequest.java

@@ -25,6 +25,7 @@
 import org.apache.dolphinscheduler.plugin.task.api.model.Property;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import lombok.AllArgsConstructor;
@@ -66,6 +67,10 @@ public class WorkflowManualTriggerRequest {
 
     private Long environmentCode;
 
+    private Date scheduleTime;
+
+    private String timeZone;
+
     @Builder.Default
     private List<Property> startParamList = new ArrayList<>();
 

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/executor/plugin/subworkflow/SubWorkflowLogicTask.java

@@ -250,6 +250,8 @@ private SubWorkflowLogicTaskRuntimeContext triggerNewSubWorkflow() {
                 .workerGroup(workflowInstance.getWorkerGroup())
                 .tenantCode(workflowInstance.getTenantCode())
                 .environmentCode(workflowInstance.getEnvironmentCode())
+                .scheduleTime(workflowInstance.getScheduleTime())
+                .timeZone(commandParam.getTimeZone())
                 .startParamList(paramList)
                 .dryRun(Flag.of(workflowInstance.getDryRun()))
                 .build();

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/workflow/trigger/WorkflowManualTrigger.java

@@ -33,6 +33,7 @@
 import org.apache.dolphinscheduler.extract.master.transportor.workflow.WorkflowManualTriggerResponse;
 
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 
 import java.util.Date;
@@ -61,6 +62,7 @@ protected ImmutablePair<WorkflowDefinition, WorkflowInstance> constructWorkflowI
         workflowInstance.setCommandType(commandType);
         workflowInstance.setStateWithDesc(WorkflowExecutionStatus.SUBMITTED_SUCCESS, commandType.name());
         workflowInstance.setRecovery(Flag.NO);
+        workflowInstance.setScheduleTime(workflowManualTriggerRequest.getScheduleTime());
         workflowInstance.setStartTime(new Date());
         workflowInstance.setRestartTime(workflowInstance.getStartTime());
         workflowInstance.setRunTimes(1);
@@ -91,7 +93,8 @@ protected Command constructTriggerCommand(final WorkflowManualTriggerRequest wor
         final RunWorkflowCommandParam runWorkflowCommandParam = RunWorkflowCommandParam.builder()
                 .commandParams(workflowManualTriggerRequest.getStartParamList())
                 .startNodes(workflowManualTriggerRequest.getStartNodes())
-                .timeZone(DateUtils.getTimezone())
+                .timeZone(
+                        StringUtils.defaultIfBlank(workflowManualTriggerRequest.getTimeZone(), DateUtils.getTimezone()))
                 .build();
         return Command.builder()
                 .commandType(CommandType.START_PROCESS)

dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/integration/cases/SubWorkflowBackfillScheduleTimeInheritanceTestCase.java

@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.server.master.integration.cases;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus;
+import org.apache.dolphinscheduler.dao.entity.WorkflowDefinition;
+import org.apache.dolphinscheduler.dao.entity.WorkflowInstance;
+import org.apache.dolphinscheduler.extract.master.command.BackfillWorkflowCommandParam;
+import org.apache.dolphinscheduler.server.master.AbstractMasterIntegrationTestCase;
+import org.apache.dolphinscheduler.server.master.integration.WorkflowOperator;
+import org.apache.dolphinscheduler.server.master.integration.WorkflowTestCaseContext;
+
+import org.apache.commons.lang3.time.DateUtils;
+
+import java.time.Duration;
+import java.util.List;
+
+import org.assertj.core.util.Lists;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+class SubWorkflowBackfillScheduleTimeInheritanceTestCase extends AbstractMasterIntegrationTestCase {
+
+    @Test
+    @DisplayName("Test sub workflow inherits parent backfill schedule time")
+    void testSubWorkflowInheritsParentBackfillScheduleTime() throws Exception {
+        final String yaml = "/it/start/workflow_with_sub_workflow_task_success.yaml";
+        final WorkflowTestCaseContext context = workflowTestCaseContextFactory.initializeContextFromYaml(yaml);
+        final WorkflowDefinition parentWorkflow = context.getWorkflow("parent_workflow");
+        final WorkflowDefinition childWorkflow = context.getWorkflow("child_workflow");
+        final String backfillTime = "2026-04-08 00:00:00";
+
+        final BackfillWorkflowCommandParam backfillWorkflowCommandParam = BackfillWorkflowCommandParam.builder()
+                .backfillTimeList(Lists.newArrayList(backfillTime))
+                .build();
+        final WorkflowOperator.WorkflowBackfillDTO workflowBackfillDTO = WorkflowOperator.WorkflowBackfillDTO.builder()
+                .workflow(parentWorkflow)
+                .backfillWorkflowCommandParam(backfillWorkflowCommandParam)
+                .build();
+
+        workflowOperator.backfillWorkflow(workflowBackfillDTO);
+
+        await()
+                .atMost(Duration.ofMinutes(1))
+                .untilAsserted(() -> {
+                    final List<WorkflowInstance> parentWorkflowInstances =
+                            repository.queryWorkflowInstance(parentWorkflow);
+                    final List<WorkflowInstance> childWorkflowInstances =
+                            repository.queryWorkflowInstance(childWorkflow);
+
+                    assertThat(parentWorkflowInstances)
+                            .singleElement()
+                            .satisfies(workflowInstance -> {
+                                assertThat(workflowInstance.getState()).isEqualTo(WorkflowExecutionStatus.SUCCESS);
+                                assertThat(workflowInstance.getScheduleTime())
+                                        .isEqualTo(DateUtils.parseDate(backfillTime, "yyyy-MM-dd HH:mm:ss"));
+                            });
+
+                    assertThat(childWorkflowInstances)
+                            .singleElement()
+                            .satisfies(workflowInstance -> {
+                                assertThat(workflowInstance.getState()).isEqualTo(WorkflowExecutionStatus.SUCCESS);
+                                assertThat(workflowInstance.getScheduleTime())
+                                        .isEqualTo(DateUtils.parseDate(backfillTime, "yyyy-MM-dd HH:mm:ss"));
+                            });
+                });
+
+        masterContainer.assertAllResourceReleased();
+    }
+}