update submitOperator

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/script/request/GroovyScriptRequest.java

@@ -1,5 +1,6 @@
 package com.codingapi.flow.script.request;
 
+import com.codingapi.flow.action.IFlowAction;
 import com.codingapi.flow.form.FormData;
 import com.codingapi.flow.node.IFlowNode;
 import com.codingapi.flow.operator.IFlowOperator;
@@ -133,6 +134,13 @@ public boolean isFlowManager(){
         return this.currentOperator.isFlowManager();
     }
 
+    /**
+     * 获取当前操作对象
+     */
+    public IFlowAction getFlowAction(){
+        return this.flowSession.getCurrentAction();
+    }
+
     /**
      * 是否模拟测试
      */
@@ -174,21 +182,14 @@ public String getCurrentOperatorName(){
      * 流程审批者Id
      */
     public long getSubmitOperatorId(){
-        if(this.submitOperator!=null) {
-            return this.submitOperator.getUserId();
-        }
-        return 0;
+        return this.submitOperator.getUserId();
     }
 
     /**
      * 流程审批者名称
      */
     public String getSubmitOperatorName(){
-        if(this.submitOperator!=null) {
-            return this.submitOperator.getName();
-        }else {
-            return null;
-        }
+        return this.submitOperator.getName();
     }
 
 

flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowActionService.java

@@ -58,7 +58,6 @@ public ActionResponse action() {
         }
 
         IFlowOperator createdOperator = flowOperatorGateway.get(flowRecord.getCreateOperatorId());
-        IFlowOperator submitOperator = flowOperatorGateway.get(flowRecord.getSubmitOperatorId());
 
         WorkflowRuntime workflowRuntime = workflowService.getWorkflowRuntime(flowRecord.getWorkRuntimeId());
         if (workflowRuntime == null) {
@@ -94,7 +93,7 @@ public ActionResponse action() {
             );
         }
 
-        FlowSession session = flowRecord.createFlowSession(this.repositoryHolder,workflow,currentOperator,createdOperator,submitOperator,formData,flowAdvice);
+        FlowSession session = flowRecord.createFlowSession(this.repositoryHolder,workflow,currentOperator,createdOperator,currentOperator,formData,flowAdvice);
         // 验证会话
         currentNode.verifySession(session);
         // 执行动作

flow-engine-framework/src/main/java/com/codingapi/flow/session/FlowSession.java

@@ -165,7 +165,7 @@ public static FlowSession startSession(
             IFlowAction currentAction,
             FormData formData,
             long backupId) {
-        return new FlowSession(repositoryHolder, currentOperator, currentOperator,null,workflow, currentNode, currentAction, formData, null, new ArrayList<>(), backupId, new FlowAdvice());
+        return new FlowSession(repositoryHolder, currentOperator, currentOperator,currentOperator,workflow, currentNode, currentAction, formData, null, new ArrayList<>(), backupId, new FlowAdvice());
     }
 
 
@@ -243,8 +243,8 @@ public IFlowNode getStartNode() {
      * 获取流程的提交者Id
      */
     public long getSubmitOperatorId(){
-        if(this.currentRecord!=null) {
-            return this.currentRecord.getCurrentOperatorId();
+        if(this.submitOperator!=null) {
+            return this.submitOperator.getUserId();
         }
         return 0;
     }
@@ -253,8 +253,8 @@ public long getSubmitOperatorId(){
      * 获取流程的提交者名称
      */
     public String getSubmitOperatorName(){
-        if(this.currentRecord!=null) {
-            return this.currentRecord.getCurrentOperatorName();
+        if(this.submitOperator!=null) {
+            return this.submitOperator.getName();
         }
         return null;
     }

flow-engine-framework/src/main/java/com/codingapi/flow/strategy/node/AdviceStrategy.java

@@ -1,6 +1,7 @@
 package com.codingapi.flow.strategy.node;
 
 import com.codingapi.flow.common.IMapConvertor;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -13,6 +14,7 @@
 @Setter
 @Getter
 @NoArgsConstructor
+@AllArgsConstructor
 public class AdviceStrategy extends BaseStrategy {
 
     /**
@@ -24,7 +26,6 @@ public class AdviceStrategy extends BaseStrategy {
      */
     private boolean signRequired;
 
-
     public static AdviceStrategy defaultStrategy() {
         AdviceStrategy strategy = new AdviceStrategy();
         strategy.setAdviceRequired(false);

flow-engine-framework/src/main/java/com/codingapi/flow/strategy/node/DelayStrategy.java

@@ -1,6 +1,7 @@
 package com.codingapi.flow.strategy.node;
 
 import com.codingapi.flow.common.IMapConvertor;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -13,6 +14,7 @@
 @Setter
 @Getter
 @NoArgsConstructor
+@AllArgsConstructor
 public class DelayStrategy extends BaseStrategy {
 
     private Type type;

flow-engine-framework/src/main/java/com/codingapi/flow/strategy/node/FormFieldPermissionStrategy.java

@@ -156,8 +156,6 @@ public void filterPermissions(FlowForm meta) {
 
         } else {
             // filter fieldPermissions
-            System.out.println("filter fieldPermissions meta:" + meta);
-
             List<FormFieldPermission> fieldPermissions = new ArrayList<>();
             for (String formField:fieldMap.keySet()){
                 String formCode = formField.split("\\.")[0];

flow-engine-framework/src/main/java/com/codingapi/flow/strategy/node/MultiOperatorAuditStrategy.java

@@ -1,6 +1,7 @@
 package com.codingapi.flow.strategy.node;
 
 import com.codingapi.flow.common.IMapConvertor;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -13,6 +14,7 @@
 @Setter
 @Getter
 @NoArgsConstructor
+@AllArgsConstructor
 public class MultiOperatorAuditStrategy extends BaseStrategy {
 
     private Type type;

flow-engine-framework/src/main/java/com/codingapi/flow/strategy/node/NodeTitleStrategy.java

@@ -3,6 +3,7 @@
 import com.codingapi.flow.common.IMapConvertor;
 import com.codingapi.flow.script.node.NodeTitleScript;
 import com.codingapi.flow.session.FlowSession;
+import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 
 import java.util.Map;
@@ -18,6 +19,10 @@ public class NodeTitleStrategy extends BaseStrategy {
      */
     private NodeTitleScript nodeTitleScript;
 
+    public NodeTitleStrategy(String titleScript) {
+        this.nodeTitleScript = new NodeTitleScript(titleScript);
+    }
+
 
     @Override
     public void copy(INodeStrategy target) {

flow-engine-framework/src/main/java/com/codingapi/flow/strategy/node/ResubmitStrategy.java

@@ -1,6 +1,7 @@
 package com.codingapi.flow.strategy.node;
 
 import com.codingapi.flow.common.IMapConvertor;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -13,6 +14,7 @@
 @Setter
 @Getter
 @NoArgsConstructor
+@AllArgsConstructor
 public class ResubmitStrategy extends BaseStrategy {
 
     private Type type;

flow-engine-framework/src/main/java/com/codingapi/flow/strategy/node/RevokeStrategy.java

@@ -1,14 +1,18 @@
 package com.codingapi.flow.strategy.node;
 
 import com.codingapi.flow.common.IMapConvertor;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.util.Map;
 
 /**
  * 撤回策略
  */
+@NoArgsConstructor
+@AllArgsConstructor
 public class RevokeStrategy extends BaseStrategy {