工作流加签、转办逻辑

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

@@ -643,9 +643,9 @@ 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);
+		else if(funcType.equals(ProcFunction.TRANSFER.value)){
+			way.set("type",ProcFunction.TRANSFER.value);
+			way.setSequenceflowname(ProcFunction.TRANSFER.text);
 		}
 		else if(funcType.equals(ProcFunction.FINISH.value)){
 			way.set("type",ProcFunction.FINISH.value);
@@ -1389,7 +1389,12 @@ public class WFCoreService
 		if (StringUtils.isEmpty(userId))
 			throw new BadRequestAlertException("未传入当前用户", entity, businessKey);
 
-		Object signUser = taskWay.get("srfwfannotator");
+		Map activedata;
+		if(taskWay.get("activedata")!=null && taskWay.get("activedata") instanceof Map)
+			activedata=(Map)taskWay.get("activedata");
+		else
+			activedata=new LinkedHashMap();
+		Object signUser = activedata.get("srfwfannotator");
 		if (ObjectUtils.isEmpty(signUser)) {
 			throw new BadRequestAlertException("未传入加签用户", entity, businessKey);
 		}
@@ -1420,8 +1425,12 @@ public class WFCoreService
 		String userId=AuthenticationUser.getAuthenticationUser().getUserid();
 		if (StringUtils.isEmpty(userId))
 			throw new BadRequestAlertException("未传入当前用户", entity, businessKey);
-
-		Object signUser = taskWay.get("srfwftransfertor");
+		Map activedata;
+		if(taskWay.get("activedata")!=null && taskWay.get("activedata") instanceof Map)
+			activedata=(Map)taskWay.get("activedata");
+		else
+			activedata=new LinkedHashMap();
+		Object signUser = activedata.get("srfwftransferor");
 		if (ObjectUtils.isEmpty(signUser)) {
 			throw new BadRequestAlertException("未传入转办用户", entity, businessKey);
 		}

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/rest/extensions/WFCoreResource.java

@@ -265,7 +265,7 @@ public class WFCoreResource
 	}
 
 	@ApiOperation(value = "后加签任务", tags = {"工作流后加签任务" },  notes = "前加签任务")
-	@RequestMapping(method = RequestMethod.POST, value = "/{system}-app-{appname}/{entity}/{businessKey}/tasks/{taskId}/aftersign")
+	@RequestMapping(method = RequestMethod.POST, value = "/{system}-app-{appname}/{entity}/{businessKey}/tasks/{taskId}/transfer")
 	public ResponseEntity<Boolean> afterSign(@PathVariable("system") String system,@PathVariable("appname") String appname,
 											 @PathVariable("entity") String entity,
 											 @PathVariable("businessKey") String businessKey,@PathVariable("taskId") String taskId,

ibzwf-util/src/main/java/cn/ibizlab/util/enums/ProcFunction.java

@@ -15,7 +15,7 @@ public enum ProcFunction {
     /**
      * 转办
      */
-    TURN("turn","转办"),
+    TRANSFER("transfer","转办"),
     /**
      * 加签完成
      */