diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index e620424..0c6b49f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -2322,4 +2322,93 @@ public class BlockFormEnumUtil { return tmp; } } + + /** + * 条件运算符 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CONDITIONAL_OPERATOR { + EQUAL(1, "=", "等于"), + NOT_EQUAL(2, "<>", "不等于"), + MORE(3, ">", "大于"), + LESS(4, "<", "小于"), + MORE_OR_EQUAL(5, ">=", "大于等于"), + LESS_OR_EQUAL (6, "<=", "小于等于"), + LIKE(7, "LIKE", "全模糊"), + START_LIKE(7, "LIKE", "前模糊"), + END_LIKE(7, "LIKE", "后模糊"), + IN(8, "in", "in"); + + private int value; + private String code; + private String description; + + private CONDITIONAL_OPERATOR(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code.toLowerCase())) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static CONDITIONAL_OPERATOR valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java index e1f0536..4cc4f2b 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description : 数据对象 @@ -95,8 +96,19 @@ public class BfDataObjectProperty extends BaseBean { @ApiParam(value ="默认查询条件") private Integer objectColumnCustomWhere; + public int getObjectColumnCustomWhereVal(){ + if(objectColumnCustomWhere == null){ + objectColumnCustomWhere = -1; + } + return objectColumnCustomWhere; + } + @Transient @ApiParam(value ="元素值") private transient Object propertyFormValue; + @Transient + @ApiParam(value ="元素值集合") + private transient List propertyFormValueList; + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java index 9669922..9a9546a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/CloudFormModel.java @@ -36,8 +36,8 @@ public class CloudFormModel { // 新增数据 private List> insertList; - // 修改数据 - private List> updateList; + // 修改条件 + private List updateConditionList; // 查询数据 private List selectList;