From 7e8730ea9fecea10b0fe536d4a754ba48239b2f3 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 6 May 2019 09:49:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3=20=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 7 ++++--- .../java/cn/estsh/i3plus/pojo/form/bean/BfButton.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java | 6 ++++++ .../cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java | 6 +++++- .../estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java | 8 ++++++++ .../cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java | 17 +++++++++++++++++ 6 files changed, 42 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 752316c..4a39acd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1053,9 +1053,10 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MESSAGE_RECEIVER_TYPE { - INTERNAL(1, "内部人员接收"), - EXTERNAL(2, "外部人员接收"), - URGENT(3, "紧急联系人接收"); + INTERNAL(1, "内部人员"), + EXTERNAL(2, "外部人员"), + URGENT(3, "紧急联系人"), + SUPPLIER(4, "供应商"); private int value; private String description; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java index 2b9622f..8dc3a8f 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfButton.java @@ -38,9 +38,9 @@ public class BfButton extends BaseBean { @ApiParam(value = "触发方式") private Integer triggerMode; - public Integer getTriggerMode() { + public int getTriggerModeVal() { if (triggerMode == null) { - return null; + return 0; } else { return triggerMode.intValue(); } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java index e88a130..7594492 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java @@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : @@ -46,4 +48,8 @@ public class BfMethod extends BaseBean { @Column(name="METHOD_DESCRIPTION") @ApiParam(value ="功能描述") private String methodDescription; + + @Transient + @ApiParam(value ="表单功能自定义按钮") + private List bfButtonList; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java index e6176e0..dec8a80 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetail.java @@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : @@ -57,5 +59,7 @@ public class BfMethodDetail extends BaseBean { @ApiParam(value ="表单元素名称") private String elementNameRdd; - + @Transient + @ApiParam(value ="表单功能自定义按钮") + private List bfButtonList; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java index 69eac9f..14eefa8 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefButtonMethod.java @@ -44,6 +44,14 @@ public class BfRefButtonMethod extends BaseBean { @ApiParam(value ="按钮位置类型") private Integer buttonPositionType; + public int getButtonPositionTypeVal(){ + if(buttonId == null){ + return 0; + } else { + return buttonPositionType.intValue(); + } + } + @Column(name="BUTTON_POSITION_REF_ID") @ApiParam(value ="按钮位置关联id") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index c8ce167..dfb3cd4 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -297,4 +297,21 @@ public final class FormHqlPack { return ddlPackBean; } + + /** + * 元素信息复杂查询 + * @param bfElement 查询条件 + * @return DdlPackBean + */ + public static DdlPackBean packHqlBfElement(BfElement bfElement){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(bfElement.getElementName(), "elementName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bfElement.getElementCode(), "elementCode", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfElement.getDataObjectId(), "dataObjectId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfElement.getElementType(), "elementType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfElement.getIsDeleted(), "isDeleted", ddlPackBean); + + return ddlPackBean; + } }