ehange

ibzwf-core/pom.xml

@@ -180,7 +180,7 @@
                                     <verbose>true</verbose>
                                     <logging>debug</logging>
                                     <contexts>!test</contexts>
-                                    <diffExcludeObjects>Index:.*,table:IBZFILE,IBZUSER,IBZDATAAUDIT</diffExcludeObjects>
+                                    <diffExcludeObjects>Index:.*,foreignKey:FK_RELATION_CHILD,FK_RELATION_PARENT,table:ibzpssystem,ibzfile,ibzuser,ibzdataaudit,act_de_databasechangelog,act_de_databasechangeloglock,act_de_model,act_de_model_history,act_de_model_relation,IBZPSSYSTEM,IBZFILE,IBZUSER,IBZDATAAUDIT,ACT_DE_DATABASECHANGELOG,ACT_DE_DATABASECHANGELOGLOCK,ACT_DE_MODEL,ACT_DE_MODEL_HISTORY,ACT_DE_MODEL_RELATION</diffExcludeObjects>
                                 </configuration>
                                 <phase>process-resources</phase>
                                 <goals>

ibzwf-core/src/main/java/cn/ibizlab/core/extensions/listener/ProcessInstanceListener.java

@@ -151,6 +151,13 @@ public class ProcessInstanceListener implements FlowableEventListener {
                 event.getEntity();
                 System.out.println("流程异常结束");
             }
+
+            if(eventType == FlowableEngineEventType.TASK_COMPLETED){
+                TaskEntity taskEntity = (TaskEntity) event.getEntity();
+
+                event.getEntity();
+                System.out.println("流程异常结束");
+            }
         }
         else if(evt instanceof FlowableActivityEventImpl)
         {

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

@@ -330,14 +330,30 @@ public class WFCoreService
 		String processInstanceBusinessKey=system+":"+entity+":k-"+businessKey;
 		Map<String, Object> variables = new LinkedHashMap<>();
 		variables.put("sequenceFlowId",taskWay.getSequenceflowid());
+		variables.put("sequenceFlowName",taskWay.getSequenceflowname());
 		variables.put("cloud-serviceid",system+"-"+appname);
 
+		Map activedata=null;
+		if(taskWay.get("activedata")!=null && taskWay.get("activedata") instanceof Map)
+		{
+			activedata=(Map)taskWay.get("activedata");
+		}
+		else
+		{
+			activedata=new LinkedHashMap();
+		}
 		Map<String, Object> transientVariables = new LinkedHashMap<>();
-		transientVariables.put("activedata",taskWay.get("activedata"));
+		transientVariables.put("activedata",activedata);
 		transientVariables.put("curuser",getCurUser());
 
+
 		//根据流程定义启动流程
 		Authentication.setAuthenticatedUserId(userId);
+		String wfprocdesc="";
+		if(activedata.get("wfprocdesc")!=null)
+			wfprocdesc=activedata.get("wfprocdesc").toString();
+
+		taskService.addComment(taskId,taskWay.getProcessinstanceid(),taskWay.getSequenceflowname(),wfprocdesc);
 		taskService.complete(taskId, variables,transientVariables);
 		WFProcessInstance instance = new WFProcessInstance();
 		instance.setBusinesskey(processInstanceBusinessKey);

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

@@ -39,7 +39,7 @@ public class WFCoreResource
 		return ResponseEntity.status(HttpStatus.OK).body(wfCoreService.getWFStep(system,appname,entity));
 	}
 
-	@PreAuthorize("hasPermission(#entity,'WFSTART',this.getEntity())")
+	//@PreAuthorize("hasPermission(#entity,'WFSTART',this.getEntity())")
 	@ApiOperation(value = "wfstart", tags = {"WFProcessInstance" },  notes = "启动工作流")
 	@RequestMapping(method = RequestMethod.POST, value = "/{system}-app-{appname}/{entity}/{businessKey}/process-instances")
 	public ResponseEntity<WFProcessInstance> wfstart(@PathVariable("system") String system,@PathVariable("appname") String appname,
@@ -65,7 +65,7 @@ public class WFCoreResource
 		return ResponseEntity.status(HttpStatus.OK).body(wfCoreService.getTaskLink(system,appname,entity,businessKey,taskId));
 	}
 
-	@PreAuthorize("hasPermission(#entity,'WFSTART',this.getEntity())")
+	//@PreAuthorize("hasPermission(#entity,'WFSTART',this.getEntity())")
 	@ApiOperation(value = "wfsubmit", tags = {"WFProcessInstance" },  notes = "工作流执行步骤")
 	@RequestMapping(method = RequestMethod.POST, value = "/{system}-app-{appname}/{entity}/{businessKey}/tasks/{taskId}")
 	public ResponseEntity<WFProcessInstance> wfsubmit(@PathVariable("system") String system,@PathVariable("appname") String appname,