wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
lvshaohua 2023-07-04 11:36:56 +08:00
parent 6d31b70a2a
commit d9b206f625
3 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmTransformUtil.java
View File

@ -97,7 +97,7 @@ public class BpmTransformUtil {
//解析条件表达式 //解析条件表达式
StringBuffer conditionExpression=new StringBuffer(); StringBuffer conditionExpression=new StringBuffer();
conditionExpression.append("${ ( "); conditionExpression.append("${ ( ");
conditionExpression.append(EXPRESSION_CLASS+"numberEquals("+parentNode.getProperty().getConditionKey()+","+parentNode.getProperty().getConditionBranchValue()+") "); conditionExpression.append(EXPRESSION_CLASS+"numberEquals("+parentNode.getProperty().getConditionBranchKey()+","+parentNode.getProperty().getConditionBranchValue()+") ");
conditionExpression.append(" ) }"); conditionExpression.append(" ) }");
flow.setConditionExpression(conditionExpression.toString()); flow.setConditionExpression(conditionExpression.toString());
@ -205,7 +205,7 @@ public class BpmTransformUtil {
//解析条件表达式 //解析条件表达式
StringBuffer conditionExpression=new StringBuffer(); StringBuffer conditionExpression=new StringBuffer();
conditionExpression.append("${ ( "); conditionExpression.append("${ ( ");
conditionExpression.append(EXPRESSION_CLASS+"numberEquals("+element.getProperty().getConditionKey()+","+element.getProperty().getConditionBranchValue()+") "); conditionExpression.append(EXPRESSION_CLASS+"numberEquals("+element.getProperty().getConditionBranchKey()+","+element.getProperty().getConditionBranchValue()+") ");
conditionExpression.append(" ) }"); conditionExpression.append(" ) }");
condition.put("nodeName", nodeName); condition.put("nodeName", nodeName);
condition.put("expression", conditionExpression.toString()); condition.put("expression", conditionExpression.toString());

16
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/dto/BpmJsonNode.java
View File

@ -23,8 +23,6 @@ public class BpmJsonNode {
private String type; // task, branch, private String type; // task, branch,
@ApiModelProperty(value = "节点名称", required = true) @ApiModelProperty(value = "节点名称", required = true)
private String name; private String name;
@ApiModelProperty(value = "节点描述", required = true)
private String desc;
// private Map<> properties; //ext : Object; 会签/或签 // private Map<> properties; //ext : Object; 会签/或签
@ApiModelProperty(value = "子节点信息", required = true) @ApiModelProperty(value = "子节点信息", required = true)
private BpmJsonNode children; private BpmJsonNode children;
@ -32,7 +30,7 @@ public class BpmJsonNode {
private List<BpmJsonNode> branches; private List<BpmJsonNode> branches;
private BpmJsonNodeProperty property; private BpmJsonNodeProperty property;
/*自己使用，不需要外界传*/ /* 内部使用，不需要外界传 */
private Map incoming = new HashMap(); private Map incoming = new HashMap();
@ -71,14 +69,6 @@ public class BpmJsonNode {
this.name = name; this.name = name;
} }
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
public BpmJsonNode getChildren() { public BpmJsonNode getChildren() {
return children; return children;
} }
@ -94,8 +84,4 @@ public class BpmJsonNode {
public void setBranches(List<BpmJsonNode> branches) { public void setBranches(List<BpmJsonNode> branches) {
this.branches = branches; this.branches = branches;
} }
class properties {
}
} }

12
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/dto/request/BpmJsonNodeProperty.java
View File

@ -7,29 +7,27 @@ import lombok.Data;
public class BpmJsonNodeProperty { public class BpmJsonNodeProperty {
/** /**
* 是否是多实例节点； * 是否是多实例Task节点；
* */ * */
private Boolean isMultiTask; private Boolean isMultiTask;
/** /**
* 多实例模式；OR："或签"，AND："会签" * Task 多实例模式；OR："或签"，AND："会签"
* */ * */
private BpmFlowMultiMode multiMode; private BpmFlowMultiMode multiMode;
/** /**
* 条件节点中是否是默认分支 * 条件节点中是否是默认分支，可以都不传;
* */ * */
private Boolean defaultCondition; private Boolean defaultCondition;
/** /**
* 条件分支的Key * 条件分支的Key
* */ * */
private String conditionKey; private String conditionBranchKey;
/** /**
* 当ConditionKey的值是多少，走该分支 * 条件节点当ConditionKey的值是多少，走该分支
* */ * */
private Integer conditionBranchValue; private Integer conditionBranchValue;
} }