未验证 提交 d54aab5c 编写于 作者: B bao liang 提交者: GitHub

fix bug: sub worker flow in complement data would run start date (#2581) (#2656)

Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>
上级 050dae7c
...@@ -634,6 +634,7 @@ public class ProcessService { ...@@ -634,6 +634,7 @@ public class ProcessService {
taskInstance.setFlag(Flag.NO); taskInstance.setFlag(Flag.NO);
this.updateTaskInstance(taskInstance); this.updateTaskInstance(taskInstance);
} }
initComplementDataParam(processDefinition, processInstance, cmdParam);
break; break;
case REPEAT_RUNNING: case REPEAT_RUNNING:
// delete the recover task names from command parameter // delete the recover task names from command parameter
...@@ -690,7 +691,9 @@ public class ProcessService { ...@@ -690,7 +691,9 @@ public class ProcessService {
Date startComplementTime = DateUtils.parse(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE), Date startComplementTime = DateUtils.parse(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE),
YYYY_MM_DD_HH_MM_SS); YYYY_MM_DD_HH_MM_SS);
processInstance.setScheduleTime(startComplementTime); if(Flag.NO == processInstance.getIsSubProcess()) {
processInstance.setScheduleTime(startComplementTime);
}
processInstance.setGlobalParams(ParameterUtils.curingGlobalParams( processInstance.setGlobalParams(ParameterUtils.curingGlobalParams(
processDefinition.getGlobalParamMap(), processDefinition.getGlobalParamMap(),
processDefinition.getGlobalParamList(), processDefinition.getGlobalParamList(),
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册