From 8402877d9a4a1884832cb210a43177c860af7261 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Wed, 17 Apr 2019 17:44:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=8A=9F=E8=83=BD=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/form/bean/BfRefButtonMethod.java | 3 +- .../i3plus/pojo/form/sqlpack/FormHqlPack.java | 33 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) 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 dd5388c..69eac9f 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 @@ -46,7 +46,8 @@ public class BfRefButtonMethod extends BaseBean { @Column(name="BUTTON_POSITION_REF_ID") @ApiParam(value ="按钮位置关联id") - private String buttonPositionRefId; + @JsonSerialize(using = ToStringSerializer.class) + private Long buttonPositionRefId; @Column(name="BUTTON_POSITION_REF_NAME_RDD") @ApiParam(value ="按钮位置关联名称") 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 d1d0f75..804c605 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 @@ -247,4 +247,37 @@ public final class FormHqlPack { return ddlPackBean; } + + /** + * 拦截器明细查询条件 + * @param bfInterceptDetail 查询条件 + * @return DdlPackBean + */ + public static DdlPackBean packHqlBfInterceptDetail(BfInterceptDetail bfInterceptDetail) { + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptId(), "interceptId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptTargetId(), "interceptTargetId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptType(), "interceptType", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptProcessResult(), "interceptProcessResult", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getInterceptPosition(), "interceptPosition", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bfInterceptDetail.getIsDeleted(), "isDeleted", ddlPackBean); + + ddlPackBean.setOrderByStr(bfInterceptDetail.orderBy()); + + return ddlPackBean; + } + + /** + * 根据id数组查询按钮功能关系 + * @return + */ + public static DdlPackBean packHqlBfRefButtonMethodByRefIds(Long[] ids) { + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getInPackArray(ids, "buttonPositionRefId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", ddlPackBean); + + return ddlPackBean; + } }