工作流加签

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/extensions/service/WFCoreService.java

@@ -16,7 +16,6 @@ import cn.ibizlab.util.service.RemoteService;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.ArrayUtils;
 import org.flowable.bpmn.BpmnAutoLayout;
 import org.flowable.bpmn.converter.BpmnXMLConverter;
 import org.flowable.bpmn.model.*;
@@ -26,10 +25,7 @@ import org.flowable.common.engine.api.identity.AuthenticationContext;
 import org.flowable.common.engine.impl.identity.Authentication;
 import org.flowable.common.engine.impl.identity.UserIdAuthenticationContext;
 import org.flowable.editor.language.json.converter.BpmnJsonConverter;
-import org.flowable.engine.HistoryService;
-import org.flowable.engine.RepositoryService;
-import org.flowable.engine.RuntimeService;
-import org.flowable.engine.TaskService;
+import org.flowable.engine.*;
 import org.flowable.engine.delegate.DelegateExecution;
 import org.flowable.engine.history.HistoricActivityInstance;
 import org.flowable.engine.history.HistoricProcessInstance;
@@ -99,6 +95,9 @@ public class WFCoreService
 	@Autowired
 	private RuntimeService runtimeService;
 
+    @Autowired
+    protected ManagementService managementService;
+
 	@Autowired
 	private WFModelService wfModelService;
 
@@ -610,14 +609,26 @@ public class WFCoreService
 		transientVariables.put("activedata",activedata);
 		//transientVariables.put("curuser",getCurUser());
 
-
 		//根据流程定义启动流程
 		Authentication.setAuthenticatedUserId(userId);
 		Authentication.setAuthenticationContext(createAuthenticationContext());
 
-		taskService.complete(taskId, variables,transientVariables);
-		WFProcessInstance instance = new WFProcessInstance();
-		instance.setBusinesskey(processInstanceBusinessKey);
+        Task curTask = taskService.createTaskQuery().taskId(taskId).singleResult();
+        taskService.complete(taskId, variables,transientVariables);
+        WFProcessInstance instance = new WFProcessInstance();
+        instance.setBusinesskey(processInstanceBusinessKey);
+
+        //加签处理
+        if (curTask != null && DelegationState.PENDING != curTask.getDelegationState() && !StringUtils.isEmpty(curTask.getParentTaskId())) {
+            String tableName = managementService.getTableName(TaskEntity.class);
+            String sql = "select count(1) from " + tableName + " where PARENT_TASK_ID_=#{parentTaskId}";
+            long subTaskCount = taskService.createNativeTaskQuery().sql(sql).parameter("parentTaskId", curTask.getParentTaskId()).count();
+            //完成加签任务，激活主任务
+            if (subTaskCount == 0) {
+                taskService.resolveTask(curTask.getParentTaskId());
+                log.info("加签任务结束，激活主任务[{}]", curTask.getParentTaskId());
+            }
+        }
 		return instance;
 	}