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

update - 调整 Condition 模型的字段定义

Browse Source
This commit is contained in:
wangli 2023-12-04 18:28:25 +08:00
parent 9f77b21091
commit 2891610735
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/BpmnCondition.java
View File

@ -24,13 +24,13 @@ public class BpmnCondition {
* string(字符串)/number(数字)/radio(单选)/checkbox(复选)
*/
@ApiModelProperty(value = "基础属性:字段类型", notes = "string, number, radio, checkbox", example = "string")
private String fieldDataType;
private String type;
/**
* 字段 code
*/
@ApiModelProperty(value = "基础属性:字段 code", notes = "字段管理中字段的 Code", example = "fieldCode")
private String fieldCode;
private String code;
/**
* 操作符(与字段类型有关)
@ -80,20 +80,20 @@ public class BpmnCondition {
@ApiModelProperty(value = "当 fieldDateType = number 并且 operator = between 时, 右侧比较值")
private String rightValue;
public String getFieldDataType() {
return fieldDataType;
public String getType() {
return type;
}
public void setFieldDataType(String fieldDataType) {
this.fieldDataType = fieldDataType;
public void setType(String type) {
this.type = type;
}
public String getFieldCode() {
return fieldCode;
public String getCode() {
return code;
}
public void setFieldCode(String fieldCode) {
this.fieldCode = fieldCode;
public void setCode(String code) {
this.code = code;
}
public String getOperator() {

14
workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnExpressionTranslator.java
View File

@ -22,13 +22,13 @@ public final class BpmnExpressionTranslator {
StringBuilder sb = new StringBuilder();
if (Objects.equals(condition.getOperator(), "contains")) {
sb.append("var:contains('")
.append(condition.getFieldCode())
.append(condition.getCode())
.append("', '")
.append(condition.getDefaultValue())
.append("')");
} else if (Objects.equals(condition.getOperator(), "notContains")) {
sb.append("!var:contains('")
.append(condition.getFieldCode())
.append(condition.getCode())
.append("', '")
.append(condition.getDefaultValue())
.append("')");
@ -48,7 +48,7 @@ public final class BpmnExpressionTranslator {
sb.append("var:")
.append(condition.getLeftOperator())
.append("('")
.append(condition.getFieldCode())
.append(condition.getCode())
.append("', ")
.append(condition.getLeftValue())
.append(")")
@ -56,7 +56,7 @@ public final class BpmnExpressionTranslator {
.append("var:")
.append(condition.getRightOperator())
.append("('")
.append(condition.getFieldCode())
.append(condition.getCode())
.append("', ")
.append(condition.getRightValue())
.append(")");
@ -64,7 +64,7 @@ public final class BpmnExpressionTranslator {
sb.append("var:")
.append(condition.getOperator())
.append("('")
.append(condition.getFieldCode())
.append(condition.getCode())
.append("', ")
.append(condition.getDefaultValue())
.append(")");
@ -80,7 +80,7 @@ public final class BpmnExpressionTranslator {
return "var:" +
condition.getOperator() +
"('" +
condition.getFieldCode() +
condition.getCode() +
"', " +
condition.getDefaultValue() +
")";
@ -93,7 +93,7 @@ public final class BpmnExpressionTranslator {
if (Objects.equals(condition.getOperator(), "in")) {
StringBuilder sb = new StringBuilder("var:containsAny(")
.append("'")
.append(condition.getFieldCode())
.append(condition.getCode())
.append("', ");
condition.getDefaultValues().forEach(i -> {
sb.append("'").append(i).append("',");

2
workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/SequenceFlowJsonConverter.java
View File

@ -87,7 +87,7 @@ public class SequenceFlowJsonConverter extends AbstractBpmnJsonConverter<Sequenc
private String parseConditions(BpmnCondition condition) {
String expression = null;
switch (condition.getFieldDataType()) {
switch (condition.getType()) {
case "number":
expression = translateNumber(condition);
break;