类名修改

flow-common/flow-common-flowable-starter/src/main/java/com/flow/flowable/cmd/JumpActivityCmd.java

@@ -30,9 +30,6 @@ public class JumpActivityCmd implements Command<List<String>> {
 
     @Override
     public List<String> execute(CommandContext commandContext) {
-        /*Expression expression = CommandContextUtil.getProcessEngineConfiguration().getExpressionManager().createExpression("conditionExpression");
-        Condition condition = new UelExpressionCondition(expression);
-        condition.evaluate(sequenceFlow.getId(), "execution");*/
         ExecutionEntityManager executionManager = CommandContextUtil.getExecutionEntityManager(commandContext);
         ExecutionEntity processInstance = executionManager.findById(processInstanceId);
         if (Objects.isNull(processInstance)) {

flow-common/flow-common-flowable-starter/src/main/java/com/flow/flowable/expression/VariableContainsAllExpressionFunction.java

@@ -11,7 +11,7 @@ import java.util.Collection;
 public class VariableContainsAllExpressionFunction extends AbstractFlowableVariableExpressionFunction {
 
     public VariableContainsAllExpressionFunction() {
-        super("containsAll");
+        super(Arrays.asList("all", "containAll"), "containsAll");
     }
 
     public static boolean containsAll(VariableContainer variableContainer, String variableName, Object... values) {

flow-workflow/flow-workflow-biz/src/main/java/com/flow/service/impl/FlowDefineServiceImpl.java

@@ -152,7 +152,7 @@ public class FlowDefineServiceImpl extends BaseServiceImpl<FlowDefineDao, FlowDe
             throw new BaseException("流程不存在");
         }
         StartNode startNode = (StartNode) define.getProcess();
-        List<FormProperty> formProperties = startNode.getFormProperties();
+        List<FieldProperty> formProperties = startNode.getFormProperties();
         return new FormInfo(define, formProperties, null);
     }
 }

flow-workflow/flow-workflow-biz/src/main/java/com/flow/service/impl/FlowTaskServiceImpl.java

@@ -13,7 +13,7 @@ import com.flow.entity.FlowDefine;
 import com.flow.entity.FlowInstance;
 import com.flow.entity.FlowTask;
 import com.flow.entity.node.ApprovalNode;
-import com.flow.entity.node.FormProperty;
+import com.flow.entity.node.FieldProperty;
 import com.flow.entity.node.Node;
 import com.flow.entity.node.StartNode;
 import com.flow.enums.ProcessStatus;
@@ -98,7 +98,7 @@ public class FlowTaskServiceImpl extends BaseServiceImpl<FlowTaskDao, FlowTask>
         Map<String, Object> variables = this.getVariables(task.getId());
         ApprovalNode approvalNode = flowDefine.getNode(task.getTaskDefinitionKey(), ApprovalNode.class);
         StartNode startNode = flowDefine.getNode(task.getTaskDefinitionKey(), StartNode.class);
-        List<FormProperty> formProperties = Objects.nonNull(approvalNode) ? approvalNode.getFormProperties() : startNode.getFormProperties();
+        List<FieldProperty> formProperties = Objects.nonNull(approvalNode) ? approvalNode.getFormProperties() : startNode.getFormProperties();
         HashMap<String, Boolean> startOpera = new HashMap<>();
         startOpera.put("complete", true);
         Map<String, Boolean> operations = Objects.nonNull(approvalNode) ? approvalNode.getOperations() : startOpera;

flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/FormModel.java

@@ -3,7 +3,7 @@ package com.flow.entity;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.flow.entity.form.Container;
 import com.flow.entity.form.Field;
-import com.flow.entity.node.FormProperty;
+import com.flow.entity.node.FieldProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -21,13 +21,13 @@ public class FormModel implements Serializable {
     private List<Object> rules;
     private List<Object> dataSource;
 
-    public void initialization(List<FormProperty> formProperties) {
+    public void initialization(List<FieldProperty> formProperties) {
         if (CollectionUtils.isNotEmpty(formProperties)) {
             Map<String, Field> fieldMap = this.allFieldsAsMap();
-            for (FormProperty formProperty : formProperties) {
-                Field field = fieldMap.get(formProperty.getId());
+            for (FieldProperty fieldProperty : formProperties) {
+                Field field = fieldMap.get(fieldProperty.getId());
                 if (Objects.nonNull(field)) {
-                    field.populateProperty(formProperty);
+                    field.populateProperty(fieldProperty);
                 }
             }
         }

flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/form/Container.java

@@ -1,7 +1,7 @@
 package com.flow.entity.form;
 
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.flow.entity.node.FormProperty;
+import com.flow.entity.node.FieldProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -23,11 +23,11 @@ public class Container extends Field {
     }
 
     @Override
-    public void populateProperty(FormProperty formProperty) {
-        if (Objects.nonNull(formProperty)) {
-            this.setHidden(formProperty.getHidden());
+    public void populateProperty(FieldProperty fieldProperty) {
+        if (Objects.nonNull(fieldProperty)) {
+            this.setHidden(fieldProperty.getHidden());
             if (CollectionUtils.isNotEmpty(children)) {
-                children.forEach(child -> child.populateProperty(formProperty));
+                children.forEach(child -> child.populateProperty(fieldProperty));
             }
         }
     }

flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/form/Field.java

@@ -2,7 +2,7 @@ package com.flow.entity.form;
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.flow.entity.node.FormProperty;
+import com.flow.entity.node.FieldProperty;
 import lombok.Data;
 
 import java.util.Map;
@@ -29,5 +29,5 @@ public abstract class Field {
 
     public abstract void populateValue(Map<String, Object> variables);
 
-    public abstract void populateProperty(FormProperty formProperty);
+    public abstract void populateProperty(FieldProperty fieldProperty);
 }

flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/form/FormItem.java

@@ -1,6 +1,6 @@
 package com.flow.entity.form;
 
-import com.flow.entity.node.FormProperty;
+import com.flow.entity.node.FieldProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -30,11 +30,11 @@ public class FormItem extends Field implements Serializable {
     }
 
     @Override
-    public void populateProperty(FormProperty formProperty) {
-        if (Objects.nonNull(formProperty)) {
-            this.setHidden(formProperty.getHidden());
-            this.setReadonly(formProperty.getReadonly());
-            this.setRequired(formProperty.getRequired());
+    public void populateProperty(FieldProperty fieldProperty) {
+        if (Objects.nonNull(fieldProperty)) {
+            this.setHidden(fieldProperty.getHidden());
+            this.setReadonly(fieldProperty.getReadonly());
+            this.setRequired(fieldProperty.getRequired());
         }
     }
 }

flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/ApprovalNode.java

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 @Data
 public class ApprovalNode extends AssigneeNode {
     // 表单属性
-    private List<FormProperty> formProperties = new ArrayList<>();
+    private List<FieldProperty> formProperties = new ArrayList<>();
     // 操作权限
     private Map<String, Boolean> operations = new LinkedHashMap<>();
     // 多人审批方式
@@ -63,6 +63,11 @@ public class ApprovalNode extends AssigneeNode {
         }
         // userTask.setAsynchronous(true);
         // userTask.setFormKey(this.getFormKey());
+        // 表单属性
+        List<FormProperty> formProperties = this.formProperties.stream()
+                .map(FieldProperty::toFormProperty)
+                .collect(Collectors.toList());
+        userTask.setFormProperties(formProperties);
         // 扩展元素
         ExtensionElement assigneeElement = new ExtensionElement();
         assigneeElement.setName("assigneeType");

flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/CcNode.java

@@ -15,7 +15,7 @@ import java.util.*;
 @Data
 public class CcNode extends AssigneeNode {
     // 表单属性
-    private List<FormProperty> formProperties = new ArrayList<>();
+    private List<FieldProperty> formProperties = new ArrayList<>();
     // 操作权限
     private Map<String, Boolean> operations = new LinkedHashMap<>();
 

flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/FieldProperty.java

@@ -0,0 +1,22 @@
+package com.flow.entity.node;
+
+import lombok.Data;
+import org.flowable.bpmn.model.FormProperty;
+
+@Data
+public class FieldProperty {
+    private String id;
+    private String name;
+    private Boolean readonly = false;
+    private Boolean hidden;
+    private Boolean required;
+
+    public FormProperty toFormProperty(){
+        FormProperty formProperty = new FormProperty();
+        formProperty.setId(id);
+        formProperty.setName(name);
+        formProperty.setReadable(!readonly);
+        formProperty.setRequired(required);
+        return formProperty;
+    }
+}

flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/FormProperty.java

@@ -1,12 +0,0 @@
-package com.flow.entity.node;
-
-import lombok.Data;
-
-@Data
-public class FormProperty {
-    private String id;
-    private String name;
-    private Boolean readonly = false;
-    private Boolean hidden;
-    private Boolean required;
-}

flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/StartNode.java

@@ -17,7 +17,7 @@ import java.util.Map;
 @Data
 public class StartNode extends Node {
     // 表单属性
-    private List<FormProperty> formProperties = new ArrayList<>();
+    private List<FieldProperty> formProperties = new ArrayList<>();
     // 操作权限
     private Map<String, Boolean> operations = new LinkedHashMap<>();
 

flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/StartTaskNode.java

@@ -17,7 +17,7 @@ import java.util.Map;
 @Data
 public class StartTaskNode extends Node {
     // 表单属性
-    private List<FormProperty> formProperties = new ArrayList<>();
+    private List<FieldProperty> formProperties = new ArrayList<>();
     // 操作权限
     private Map<String, Boolean> operations = new LinkedHashMap<>();
 

flow-workflow/flow-workflow-entity/src/main/java/com/flow/model/FormInfo.java

@@ -2,7 +2,7 @@ package com.flow.model;
 
 import com.flow.entity.FlowDefine;
 import com.flow.entity.FormModel;
-import com.flow.entity.node.FormProperty;
+import com.flow.entity.node.FieldProperty;
 import com.flow.enums.ProcessStatus;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -45,7 +45,7 @@ public class FormInfo {
     }
 
     public FormInfo(FlowDefine flowDefine,
-                    List<FormProperty> formProperties,
+                    List<FieldProperty> formProperties,
                     Map<String, Object> variables) {
         this(flowDefine);
         if (Objects.nonNull(flowDefine)) {
@@ -56,7 +56,7 @@ public class FormInfo {
     }
 
     public FormInfo(FlowDefine flowDefine,
-                    List<FormProperty> formProperties,
+                    List<FieldProperty> formProperties,
                     Map<String, Object> variables,
                     Map<String, Boolean> operations) {
         this(flowDefine, formProperties, variables);