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 bb75436..8fcfab5 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 @@ -419,6 +419,48 @@ public class ImppEnumUtil { } /** + * 用户消息发送状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MESSAGE_SEND_STATUS { + + SENDING(1, "发送中"), + SEND_SUCCESS(2, "发送成功"), + SEND_FAIL(3, "发送失败"); + + private int value; + private String description; + + MESSAGE_SEND_STATUS() { + } + + MESSAGE_SEND_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** * 用户消息类型 * 1.NOTICE:通知 * 2.STATION_LETTER:站内信 diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java index 8085d44..06adc7a 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethodDetailProperty.java @@ -57,29 +57,11 @@ public class BfMethodDetailProperty extends BaseBean { @ApiParam(value ="主对象元素名称") private String priElementNameRdd; - @Column(name="PRI_ELEMENT_PROPERTY_ID") - @ApiParam(value ="主对象元素属性id") - @JsonSerialize(using = ToStringSerializer.class) - private Long priElementPropertyId; - - @Column(name="PRI_ELEMENT_PROPERTY_NAME_RDD") - @ApiParam(value ="主对象元素属性名称") - private String priElementPropertyNameRdd; - - @Column(name="PRI_ELEMENT_PROPERTY_CODE_RDD") - @ApiParam(value ="主对象元素属性code") - private String priElementPropertyCodeRdd; - // 枚举:BlockFormEnumUtil.TRIGGER_EVENT @Column(name="PRI_ELEMENT_EVENT") @ApiParam(value ="主对象元素事件") private Integer priElementEvent; - // 枚举:BlockFormEnumUtil.SQL_REF_TYPE - @Column(name="ASSOCIATE_TYPE") - @ApiParam(value ="关联类型") - private Integer associateType; - @Column(name="SEC_METHOD_DETAIL_ID") @ApiParam(value ="关联功能明细id") @JsonSerialize(using = ToStringSerializer.class) @@ -98,19 +80,6 @@ public class BfMethodDetailProperty extends BaseBean { @ApiParam(value ="关联对象元素名称") private String secElementNameRdd; - @Column(name="SEC_ELEMENT_PROPERTY_ID") - @ApiParam(value ="关联对象元素属性id") - @JsonSerialize(using = ToStringSerializer.class) - private Long secElementPropertyId; - - @Column(name="SEC_ELEMENT_PROPERTY_NAME_RDD") - @ApiParam(value ="关联对象元素属性名称") - private String secElementPropertyNameRdd; - - @Column(name="SEC_ELEMENT_PROPERTY_CODE_RDD") - @ApiParam(value ="关联对象元素属性Code") - private String secElementPropertyCodeRdd; - @Transient @ApiParam(value ="表单功能明细关联属性") private List refList; 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 903c276..e41ee5c 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 @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.platform.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -93,13 +95,22 @@ public class SysMessage extends BaseBean { @ApiParam(value = "是否系统邮件") private Integer isSystem; + @Column(name = "SEND_STATUS") + @ApiParam(value = "发送状态") + @AnnoOutputColumn(refClass = ImppEnumUtil.MESSAGE_SEND_STATUS.class) + private Integer sendStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam(value = "错误信息") + private String errorMessage; + @Transient @ApiParam(value = "阅读统计") @JsonSerialize(using = ToStringSerializer.class) private Long readCount; - public long getReadCountVal(){ - if(readCount == null){ + public long getReadCountVal() { + if (readCount == null) { return 0; } else { return readCount.longValue(); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java index 840eb7e..4743182 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java @@ -33,6 +33,7 @@ import java.util.List; public class SysRefRoleMenu extends BaseBean { private static final long serialVersionUID = -2013469818246101184L; + @Column(name="MENU_ID") @ApiParam(value ="菜单ID" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 9036bc3..166e94a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -508,17 +508,14 @@ public class CoreHqlPack { * @param sysTaskCycle * @return */ - public static String packHqlSysTaskCycle(SysTaskCycle sysTaskCycle) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysTaskCycle(SysTaskCycle sysTaskCycle) { + DdlPackBean result = DdlPackBean.getDdlPackBean(sysTaskCycle); // hql拼接 - HqlPack.getStringLikerPack(sysTaskCycle.getName(), "name", result); - HqlPack.getStringEqualPack(sysTaskCycle.getOrganizeCode(), "organizeCode", result); - - // 添加默认排序 - HqlPack.getOrderDefault(sysTaskCycle); + DdlPreparedPack.getStringLikerPack(sysTaskCycle.getName(), "name", result); + DdlPreparedPack.getStringEqualPack(sysTaskCycle.getOrganizeCode(), "organizeCode", result); - return result.toString(); + return result; } /** @@ -1144,4 +1141,14 @@ public class CoreHqlPack { return ddlPackBean; } + + public static DdlPackBean packHqlSysTaskPlanOnly(SysTaskPlan sysTaskPlan){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysTaskPlan); + + DdlPreparedPack.getNumEqualPack(sysTaskPlan.getId(),"id",ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysTaskPlan.getName(),"name",ddlPackBean); + DdlPreparedPack.getStringEqualPack(sysTaskPlan.getGroupName(),"groupName",ddlPackBean); + + return ddlPackBean; + } } \ No newline at end of file