From 0da89fa17ef21d375182ea49d5fdf093c1cdac58 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Sat, 13 Apr 2019 17:02:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=A8=E5=8D=95-=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A1=8C=E5=88=97=E8=AE=BE=E7=BD=AE=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E6=95=B0=E6=8D=AE=20SWEB=E9=80=9A=E7=9F=A5=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E8=B0=83=E6=95=B4=20=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=97=A5=E5=BF=97=E6=B7=BB=E5=8A=A0=E6=89=80=E5=B1=9E?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=20=E6=B6=88=E6=81=AF=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=89=80=E5=B1=9E=E6=A8=A1=E5=9D=97=20=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E5=8A=A1=E8=B0=83=E7=94=A8=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java | 14 +++++++------- .../pojo/model/platform/MessagePagerModel.java | 20 ++++++++++++++++++++ .../model/platform/RefUserMessagePagerModel.java | 20 ++++++++++++++++++++ .../estsh/i3plus/pojo/platform/bean/SysMessage.java | 2 +- .../pojo/platform/platbean/SysLogTaskTime.java | 4 ++++ 5 files changed, 52 insertions(+), 8 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MessagePagerModel.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RefUserMessagePagerModel.java 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 93a016e..d1d0f75 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 @@ -142,15 +142,15 @@ public final class FormHqlPack { * @param bfMethod 表单功能查询条件 * @return hql */ - public static String packHqlBfMethod(BfMethod bfMethod) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBfMethod(BfMethod bfMethod) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringLikerPack(bfMethod.getMethodName(), "methodName", result); - HqlPack.getNumEqualPack(bfMethod.getLayoutId(), "layoutId", result); - HqlPack.getNumEqualPack(bfMethod.getIsDeleted(), "isDeleted", result); - result.append(bfMethod.orderBy()); + DdlPreparedPack.getStringLikerPack(bfMethod.getMethodName(), "methodName", result); + DdlPreparedPack.getNumEqualPack(bfMethod.getLayoutId(), "layoutId", result); + DdlPreparedPack.getNumEqualPack(bfMethod.getIsDeleted(), "isDeleted", result); + result.setOrderByStr(bfMethod.orderBy()); - return result.toString(); + return result; } /** diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MessagePagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MessagePagerModel.java new file mode 100644 index 0000000..442e0a2 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MessagePagerModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.platform.bean.SysMessage; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-04-13 15:27 + * @Modify: + **/ +@Data +public class MessagePagerModel { + + private SysMessage sysMessage; + + private Pager pager; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RefUserMessagePagerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RefUserMessagePagerModel.java new file mode 100644 index 0000000..97b20df --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RefUserMessagePagerModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-04-13 15:27 + * @Modify: + **/ +@Data +public class RefUserMessagePagerModel { + + private SysRefUserMessage sysRefUserMessage; + + private Pager pager; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index d1491e0..5257aed 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -48,7 +48,7 @@ public class SysMessage extends BaseBean { public int getMessageTypeValue() { if(this.messageType == null){ - return ImppEnumUtil.MESSAGE_TYPE.LETTER.getValue(); + return 0; } else { return this.messageType.intValue(); } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index 1f8d2b1..569a11c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -43,6 +43,10 @@ public class SysLogTaskTime extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long taskPlanId; + @Column(name = "TASK_SOFT_TYPE_RDD") + @ApiParam(value = "任务所属模块") + private Integer taskSoftTypeRdd; + @Column(name="TASK_CYCLE_NAME_RDD") @ApiParam(value ="任务周期名称") private String taskCycleNameRdd; From bb510e573d54688922647fb576e31c478a4be927 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Sat, 13 Apr 2019 18:20:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=B8=83=E5=B1=80-?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=A1=8C=E5=88=97=E6=A0=A1=E9=AA=8C=20?= =?UTF-8?q?=E5=BF=85=E9=A1=BB=E4=BF=9D=E7=95=991=E8=A1=8C1=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java index 8903aea..2441c0d 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayout.java @@ -49,9 +49,9 @@ public class BfLayout extends BaseBean { @ApiParam(value = "列数") private Integer layoutColumnCount; - public Integer getLayoutColumnCount(){ + public Integer getLayoutColumnCountValue(){ if(this.layoutColumnCount == null) { - return null; + return 0; } return layoutColumnCount.intValue(); } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java index 3996e81..df72dd0 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfLayoutRow.java @@ -52,6 +52,13 @@ public class BfLayoutRow extends BaseBean { @ApiParam(value = "行所关联列数") private Integer rowColNum; + public int getRowColNumValue(){ + if(rowColNum == null){ + return 0; + } + return rowColNum.intValue(); + } + // 行所包含的列 @Transient private List bfLayoutColumns;