Commit 95278107 authored by 雍欢's avatar 雍欢

能够正常使用子流程

parent e0d593cb
...@@ -26,6 +26,7 @@ import org.activiti.bpmn.model.FlowNode; ...@@ -26,6 +26,7 @@ import org.activiti.bpmn.model.FlowNode;
import org.activiti.engine.ActivitiException; import org.activiti.engine.ActivitiException;
import org.activiti.engine.RepositoryService; import org.activiti.engine.RepositoryService;
import org.activiti.engine.delegate.*; import org.activiti.engine.delegate.*;
import org.activiti.engine.history.HistoricTaskInstance;
import org.activiti.engine.impl.Condition; import org.activiti.engine.impl.Condition;
import org.activiti.engine.impl.bpmn.parser.BpmnParse; import org.activiti.engine.impl.bpmn.parser.BpmnParse;
import org.activiti.engine.impl.context.Context; import org.activiti.engine.impl.context.Context;
...@@ -757,9 +758,17 @@ public class FlowBroker extends BaseApplication implements TaskListener, Executi ...@@ -757,9 +758,17 @@ public class FlowBroker extends BaseApplication implements TaskListener, Executi
} }
if (!StringUtil.isBlank(applicantFullId) && !StringUtil.isBlank(getApprovalParameter().getTaskId())) { if (!StringUtil.isBlank(applicantFullId) && !StringUtil.isBlank(getApprovalParameter().getTaskId())) {
ThreadLocalUtil.putVariable(Constants.MAKEACOPYFORPREFIX, "办结提醒:"); ThreadLocalUtil.putVariable(Constants.MAKEACOPYFORPREFIX, "办结提醒:");
List<String> executorIds = new ArrayList<String>(1); List<String> executorIds = new ArrayList<>(1);
executorIds.add(applicantFullId); executorIds.add(applicantFullId);
this.workflowService.makeACopyFor(getApprovalParameter().getTaskId(), executorIds); // 查找流程申请节点
HistoricTaskInstance applyTask = delegateExecution.getEngineServices().getHistoryService().createHistoricTaskInstanceQuery()
.processInstanceId(delegateExecution.getProcessInstanceId())
.taskDefinitionKey("Apply")
.singleResult();
String taskId = applyTask != null
? applyTask.getId()
: getApprovalParameter().getTaskId();
this.workflowService.makeACopyFor(taskId, executorIds);
delegateExecution.setVariable(IS_MAKE_A_COPY_FOR, true); delegateExecution.setVariable(IS_MAKE_A_COPY_FOR, true);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment