diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmTransformUtil.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmTransformUtil.java index d077d7441..14b42f483 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmTransformUtil.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmTransformUtil.java @@ -97,7 +97,7 @@ public class BpmTransformUtil { //解析条件表达式 StringBuffer conditionExpression=new StringBuffer(); 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(" ) }"); flow.setConditionExpression(conditionExpression.toString()); @@ -205,7 +205,7 @@ public class BpmTransformUtil { //解析条件表达式 StringBuffer conditionExpression=new StringBuffer(); 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(" ) }"); condition.put("nodeName", nodeName); condition.put("expression", conditionExpression.toString()); diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/dto/BpmJsonNode.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/dto/BpmJsonNode.java index ca56fe122..099637213 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/dto/BpmJsonNode.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/dto/BpmJsonNode.java @@ -23,8 +23,6 @@ public class BpmJsonNode { private String type; // task, branch, @ApiModelProperty(value = "节点名称", required = true) private String name; - @ApiModelProperty(value = "节点描述", required = true) - private String desc; // private Map<> properties; //ext : Object; 会签/或签 @ApiModelProperty(value = "子节点信息", required = true) private BpmJsonNode children; @@ -32,7 +30,7 @@ public class BpmJsonNode { private List branches; private BpmJsonNodeProperty property; - /*自己使用,不需要外界传*/ + /* 内部使用,不需要外界传 */ private Map incoming = new HashMap(); @@ -71,14 +69,6 @@ public class BpmJsonNode { this.name = name; } - public String getDesc() { - return desc; - } - - public void setDesc(String desc) { - this.desc = desc; - } - public BpmJsonNode getChildren() { return children; } @@ -94,8 +84,4 @@ public class BpmJsonNode { public void setBranches(List branches) { this.branches = branches; } - - class properties { - - } } diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/dto/request/BpmJsonNodeProperty.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/dto/request/BpmJsonNodeProperty.java index 1d12330c4..ebe724995 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/dto/request/BpmJsonNodeProperty.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/dto/request/BpmJsonNodeProperty.java @@ -7,29 +7,27 @@ import lombok.Data; public class BpmJsonNodeProperty { /** - * 是否是多实例节点; + * 是否是多实例Task节点; * */ private Boolean isMultiTask; /** - * 多实例模式;OR:"或签",AND:"会签" + * Task 多实例模式;OR:"或签",AND:"会签" * */ private BpmFlowMultiMode multiMode; /** - * 条件节点中是否是默认分支 + * 条件节点中是否是默认分支,可以都不传; * */ private Boolean defaultCondition; /** * 条件分支的Key * */ - private String conditionKey; + private String conditionBranchKey; /** - * 当ConditionKey的值是多少,走该分支 + * 条件节点当ConditionKey的值是多少,走该分支 * */ private Integer conditionBranchValue; - - }