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;