From cbfc1b470e4adbe10bdcc4f8d9f49b0f135ed53b Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 16 Apr 2019 19:51:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B9=B3=E5=8F=B0-=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=BB=84=E7=BB=87=E4=BF=AE=E6=94=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E8=A1=A8=E5=8D=95-=E6=8B=A6=E6=88=AA=E5=99=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=A7=E8=A1=8C=E9=A1=BA=E5=BA=8F=20?= =?UTF-8?q?=E8=A1=A8=E5=8D=95-=E5=8A=9F=E8=83=BD=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=89=8D=E5=90=8E=E7=AB=AF=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/form/bean/BfIntercept.java | 7 +++++-- .../i3plus/pojo/form/bean/BfInterceptDetail.java | 22 ++++++++++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java index 4803300..d72ec65 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java @@ -41,6 +41,9 @@ public class BfIntercept extends BaseBean { @Column(name="EXECUTE_CONTENT") @ApiParam(value ="执行内容") - @JsonSerialize(using = ToStringSerializer.class) - private Integer executeContent; + private String executeContent; + + @Column(name="INTERCEPT_DESCRIPTION") + @ApiParam(value ="拦截器描述") + private String interceptDescription; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java index 900be53..85d797c 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfInterceptDetail.java @@ -48,9 +48,9 @@ public class BfInterceptDetail extends BaseBean { @ApiParam(value ="拦截器位置") private Integer interceptPosition; - public Integer getInterceptPosition() { + public int getInterceptPositionVal() { if(this.interceptPosition == null){ - return null; + return 0; } else { return this.interceptPosition.intValue(); } @@ -69,4 +69,22 @@ public class BfInterceptDetail extends BaseBean { @ApiParam(value ="拦截器业务结果处理") private Integer interceptProcessResult; + public int getInterceptProcessResultVal(){ + if(interceptProcessResult == null ){ + return 0; + } + return interceptProcessResult.intValue(); + } + + @Column(name="INTERCEPT_EXECUTE_SORT") + @ApiParam(value ="拦截器业务执行顺序") + private Integer interceptExecuteSort; + + public int getInterceptExecuteSortVal(){ + if(interceptExecuteSort == null ){ + return 0; + } + return interceptExecuteSort.intValue(); + } + } From bec70bc79d86450a6d3dad2f4eb09092cf212220 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Tue, 16 Apr 2019 20:40:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?DdlPack=EF=BC=8C=E6=95=B0=E5=AD=97equals?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A7=E4=BA=8E0=E7=9A=84=E7=BA=A6?= =?UTF-8?q?=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index f74f02f..590ad9a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -255,7 +255,7 @@ public class DdlPreparedPack { * @param packBean */ public static void getNumEqualPack(Object data, String columnName, DdlPackBean packBean) { - if (data != null) { + if (data != null && Long.parseLong(data.toString()) > 0) { packBean.addColumnQuery(columnName," and model." + columnName + " = :m_" + columnName, data); } }