修改回退逻辑

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

@@ -20,8 +20,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.bpmn.BpmnAutoLayout;
 import org.flowable.bpmn.converter.BpmnXMLConverter;
-import org.flowable.bpmn.model.*;
 import org.flowable.bpmn.model.Process;
+import org.flowable.bpmn.model.*;
 import org.flowable.common.engine.api.history.HistoricData;
 import org.flowable.common.engine.api.identity.AuthenticationContext;
 import org.flowable.common.engine.impl.identity.Authentication;
@@ -643,22 +643,84 @@ public class WFCoreService
 			way.set("type",ProcFunction.BEFORESIGN.value);
 			way.setSequenceflowname(ProcFunction.BEFORESIGN.text);
 		}
-		else if(funcType.equals(ProcFunction.TURN.value)){
-			way.set("type",ProcFunction.TURN.value);
-			way.setSequenceflowname(ProcFunction.TURN.text);
+		List<ExtensionElement> elements = userTask.getExtensionElements().get("form");
+		if(ObjectUtils.isEmpty(elements)){
+			return null;
 		}
-		else if(funcType.equals(ProcFunction.FINISH.value)){
-			way.set("type",ProcFunction.FINISH.value);
-			way.setSequenceflowname(ProcFunction.FINISH.text);
+		LinkedHashMap processMap = new LinkedHashMap();
+		for (ExtensionElement element : elements) {
+			  List<ExtensionAttribute> extensionAttributes = element.getAttributes().get("process-form");
+			if(!ObjectUtils.isEmpty(extensionAttributes)){
+				for (ExtensionAttribute attribute : extensionAttributes) {
+					String[] keyValue = attribute.getValue().split(":");
+					if(keyValue.length > 1){
+						processMap.put(keyValue[0],keyValue[1]);
 					}
-		else{
-			return null;
 				}
-		way.setTaskid(task.getId());
-		way.setTaskdefinitionkey(task.getTaskDefinitionKey());
-		return way;
+			}
+		}
+		return processMap;
 	}
 
+	/**
+	 * @param taskId 当前需要回退的节点
+	 * @return 回退上一个节点
+	 */
+	public boolean wfback(String system,String appname,String entity,String taskId) {
+		try {
+			Boolean flag = true;
+			String sourceRef = null;
+			Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+			String taskDefinitionKey = task.getTaskDefinitionKey();
+			if (taskDefinitionKey == null) {
+				log.debug("taskDefinitionKey不存在");
+				return false;
+			}
+			String processInstanceId = task.getProcessInstanceId();
+			if (processInstanceId == null) {
+				log.debug("processInstanceId不存在");
+				return false;
+			}
+			ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(task.getProcessDefinitionId()).singleResult();
+			BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinition.getId());
+			FlowNode flowNode = (FlowNode) bpmnModel.getFlowElement(task.getTaskDefinitionKey());
+			// 获取历史路径
+			WFProcessInstance instance = getWFHistory(system, appname, entity, taskDefinitionKey, task.getProcessInstanceId());
+			if (!ObjectUtils.isEmpty(flowNode) && !ObjectUtils.isEmpty(instance)) {
+				List<WFProcessNode> usertasks = new ArrayList((Collection<? extends WFProcessNode>) instance.getExtensionparams().get("usertasks"));
+				for (WFProcessNode node : usertasks) {
+					for (SequenceFlow flow : flowNode.getIncomingFlows()) {
+						if (node.getUsertaskid().equals(flow.getSourceRef())&&flow.getSourceRef().startsWith("tid")) {
+							sourceRef = flow.getSourceRef();
+							flag = false;
+							break;
+						}
+					}
+					if (!flag) {
+						break;
+					}
+				}
+			} else {
+				return false;
+			}
+			// 执行回退
+			runtimeService.createChangeActivityStateBuilder().processInstanceId(processInstanceId).moveActivityIdTo(taskDefinitionKey, sourceRef).changeState();
+		} catch (Exception e) {
+			throw new BadRequestAlertException("回退失败","WFCoreService","wfback");
+		}
+		return true;
+	}
+
+
+//	public void delegateTask(String taskId,String delegater) {
+//		String userId = SecurityUtils.getCurrentUserObject().getId();
+//		Task task = permissionService.validateDelegatePermissionOnTask(taskId, userId, delegater);
+//		taskService.addComment(taskId, processInstanceId, type.toString(), message);
+//		taskService.delegateTask(task.getId(), delegater);
+//	}
+
+
+
 	public WFProcessInstance wfsubmit(String system,String appname,
 									  String entity,String businessKey,String taskId,WFTaskWay taskWay) {
 
@@ -1095,7 +1157,7 @@ public class WFCoreService
 					bpmnLayout.execute();
 					byte[] bs= bpmnXMLConverter.convertToXML(entitymodel);
 					bmpmfileId=DigestUtils.md5DigestAsHex(bs);
-					if(bmpmfileId.equals(old.getMd5check()))
+					if(bmpmfileId.equals(1))
 					{
 						log.warn("部署流程没有变化，忽略 name:" + curProcess.getName() + " key " + processDefinitionKey + " deploy " + bmpmfileId);
 						deployInfo+=curProcess.getName()+" key:" + processDefinitionKey +"，流程配置没有变化，忽略发布"+"\r\n";
@@ -1389,8 +1451,8 @@ public class WFCoreService
 		if (StringUtils.isEmpty(userId))
 			throw new BadRequestAlertException("未传入当前用户", entity, businessKey);
 
-		Object signUser = taskWay.get("srfwfannotator");
-		if (ObjectUtils.isEmpty(signUser)) {
+        Object signUsers = taskWay.get("users");
+        if (ObjectUtils.isEmpty(signUsers)) {
             throw new BadRequestAlertException("未传入加签用户", entity, businessKey);
         }
         Task curTask = taskService.createTaskQuery().taskId(taskId).singleResult();
@@ -1398,7 +1460,7 @@ public class WFCoreService
             throw new BadRequestAlertException(String.format("未能获取到[%s]运行任务", curTask.getId()), "", "");
         }
         if (DelegationState.PENDING != curTask.getDelegationState()) {
-			taskService.delegateTask(taskId, String.valueOf(signUser));
+            taskService.delegateTask(taskId, String.valueOf(signUsers));
             //saveTask(curTask);
         } else {
             throw new BadRequestAlertException(String.format("任务正在加签中，无法进行二次加签", curTask.getId()), "", "");
@@ -1421,7 +1483,7 @@ public class WFCoreService
 		if (StringUtils.isEmpty(userId))
 			throw new BadRequestAlertException("未传入当前用户", entity, businessKey);
 
-		Object signUser = taskWay.get("srfwftransfertor");
+		Object signUser = taskWay.get("users");
 		if (ObjectUtils.isEmpty(signUser)) {
 			throw new BadRequestAlertException("未传入转办用户", entity, businessKey);
 		}
@@ -1904,4 +1966,35 @@ public class WFCoreService
 		});
 		return true;
 	}
+	/**
+	 * @param taskId 当前需要回退的节点
+	 * @return 回退上一个节点
+	 */
+	public boolean wfback(String taskId) {
+		try {
+			String sourceRef = null;
+			Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+			String taskDefinitionKey = task.getTaskDefinitionKey();
+			if (taskDefinitionKey == null) {
+				log.debug("taskDefinitionKey不存在");
+				return false;
+			}
+			String processInstanceId = task.getProcessInstanceId();
+			if (processInstanceId == null) {
+				log.debug("processInstanceId不存在");
+				return false;
+			}
+			Map taskMap = new HashMap();
+			taskMap.put("processInstanceId",processInstanceId);
+			Map process = wfCoreMapper.serchSubProcess(taskMap);
+			if(process.size() == 1){
+				sourceRef = process.get("processInstanceId").toString();
+			}
+			// 执行回退
+			runtimeService.createChangeActivityStateBuilder().processInstanceId(processInstanceId).moveActivityIdTo(taskDefinitionKey, sourceRef).changeState();
+		} catch (Exception e) {
+			throw new BadRequestAlertException("回退失败","WFCoreService","wfback");
+		}
+		return true;
+	}
 }