diff --git a/src/main/java/neatlogic/framework/process/dto/ChannelVo.java b/src/main/java/neatlogic/framework/process/dto/ChannelVo.java index 89fe5304bacce28304f756f126b24b3d91dd443a..14a76c2978e60a5b62f91a0f4e75786e1bd9d9c3 100644 --- a/src/main/java/neatlogic/framework/process/dto/ChannelVo.java +++ b/src/main/java/neatlogic/framework/process/dto/ChannelVo.java @@ -71,14 +71,8 @@ public class ChannelVo extends BasePageVo { @EntityField(name = "默认优先级", type = ApiParamType.STRING) private String defaultPriorityUuid; - @EntityField(name = "是否显示上报页描述", type = ApiParamType.INTEGER) - private Integer allowDesc; - - @EntityField(name = "描述帮助", type = ApiParamType.STRING) - private String help; - - @EntityField(name = "是否激活描述帮助", type = ApiParamType.INTEGER) - private Integer isActiveHelp; + @EntityField(name = "工单上报页描述文本占位符", type = ApiParamType.STRING) + private String contentHelp; @EntityField(name = "时效", type = ApiParamType.INTEGER) private Integer sla; @@ -136,9 +130,7 @@ public class ChannelVo extends BasePageVo { this.icon = channelVo.icon; this.color = channelVo.color; this.parentUuid = channelVo.parentUuid; - this.allowDesc = channelVo.allowDesc; - this.help = channelVo.help; - this.isActiveHelp = channelVo.isActiveHelp; + this.contentHelp = channelVo.contentHelp; this.sla = channelVo.sla; this.channelTypeUuid = channelVo.channelTypeUuid; this.support = channelVo.support; @@ -274,28 +266,12 @@ public class ChannelVo extends BasePageVo { this.defaultPriorityUuid = defaultPriorityUuid; } - public Integer getAllowDesc() { - return allowDesc; - } - - public void setAllowDesc(Integer allowDesc) { - this.allowDesc = allowDesc; - } - - public String getHelp() { - return help; - } - - public void setHelp(String help) { - this.help = help; - } - - public Integer getIsActiveHelp() { - return isActiveHelp; + public String getContentHelp() { + return contentHelp; } - public void setIsActiveHelp(Integer isActiveHelp) { - this.isActiveHelp = isActiveHelp; + public void setContentHelp(String contentHelp) { + this.contentHelp = contentHelp; } public Integer getSla() { diff --git a/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepVo.java b/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepVo.java index 2012dd904cd405f40c9eab75b38cb1d5cbf4f097..b589dd340f73944a22a1e2ae14e2a535f5894e27 100644 --- a/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepVo.java +++ b/src/main/java/neatlogic/framework/process/dto/ProcessTaskStepVo.java @@ -91,6 +91,8 @@ public class ProcessTaskStepVo extends BasePageVo { private Integer isNeedUploadFile; @EntityField(name = "是否需要回复框", type = ApiParamType.INTEGER) private Integer isNeedContent; + @EntityField(name = "回复框帮助", type = ApiParamType.STRING) + private String contentHelp; @EntityField(name = "回复是否必填", type = ApiParamType.INTEGER) private Integer isRequired; @EntityField(name = "启用重审", type = ApiParamType.INTEGER) @@ -355,6 +357,14 @@ public class ProcessTaskStepVo extends BasePageVo { return isNeedContent; } + public String getContentHelp() { + return contentHelp; + } + + public void setContentHelp(String contentHelp) { + this.contentHelp = contentHelp; + } + public Integer getEnableReapproval() { if (enableReapproval == null && StringUtils.isNotBlank(configHash)) { enableReapproval = ProcessStepInternalHandlerFactory.getHandler().getEnableReapprovalByConfigHash(configHash);