Merge pull request #160 from codingapi/dev

RejectAction add FlowRecordDoneEvent

Author: xlorne

flow-engine-example/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.49</version>
+        <version>0.0.50</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

flow-engine-framework/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.49</version>
+        <version>0.0.50</version>
     </parent>
 
     <name>flow-engine-framework</name>

flow-engine-framework/src/main/java/com/codingapi/flow/action/actions/RejectAction.java

@@ -4,6 +4,7 @@
 import com.codingapi.flow.action.ActionType;
 import com.codingapi.flow.action.BaseAction;
 import com.codingapi.flow.action.IFlowAction;
+import com.codingapi.flow.event.FlowRecordDoneEvent;
 import com.codingapi.flow.event.FlowRecordTodoEvent;
 import com.codingapi.flow.event.IFlowEvent;
 import com.codingapi.flow.exception.FlowStateException;
@@ -98,6 +99,9 @@ public void run(FlowSession flowSession) {
         flowRecord.update(flowSession, true);
         recordList.add(flowRecord);
 
+        // 当前审批为已办状态
+        flowEvents.add(new FlowRecordDoneEvent(flowRecord, flowSession.isMock()));
+
         List<FlowRecord> records = this.generateRecords(flowSession);
         if (!records.isEmpty()) {
             recordList.addAll(records);

flow-engine-starter-api/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.49</version>
+        <version>0.0.50</version>
     </parent>
 
     <name>flow-engine-starter-api</name>

flow-engine-starter-infra/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.49</version>
+        <version>0.0.50</version>
     </parent>
 
     <name>flow-engine-starter-infra</name>

flow-engine-starter-query/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.49</version>
+        <version>0.0.50</version>
     </parent>
 
     <name>flow-engine-starter-query</name>

flow-engine-starter/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.codingapi.flow</groupId>
         <artifactId>flow-engine-parent</artifactId>
-        <version>0.0.49</version>
+        <version>0.0.50</version>
     </parent>
 
     <name>flow-engine-starter</name>

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.codingapi.flow</groupId>
 	<artifactId>flow-engine-parent</artifactId>
-	<version>0.0.49</version>
+	<version>0.0.50</version>
     <packaging>pom</packaging>
 
     <url>https://github.com/codingapi/flow-engine</url>