diff --git a/src/main/java/neatlogic/framework/process/constvalue/ItsmTenantConfig.java b/src/main/java/neatlogic/framework/process/constvalue/ItsmTenantConfig.java index 9c4ab970be3c6f6789749c2fc0299897618f4b06..d92f0d2f1721cf2b1e723192a11189c72d235eb7 100644 --- a/src/main/java/neatlogic/framework/process/constvalue/ItsmTenantConfig.java +++ b/src/main/java/neatlogic/framework/process/constvalue/ItsmTenantConfig.java @@ -21,7 +21,8 @@ import neatlogic.framework.util.$; public enum ItsmTenantConfig implements ITenantConfig { PROCESS_TASK_BASE_INFO_IS_SHOW("processtaskBaseInfoIsShow", null, "term.itsm.isshowbaseinfo"), PROCESS_TASK_STEP_ENABLE_COMMENT("processTaskStepEnableComment", null, "nfpc.itsmtenantconfig.processtaskstepenablecomment"), - DISPLAY_MODE_AFTER_TIMEOUT("displayModeAfterTimeout", "naturalTime", "nfpc.itsmtenantconfig.displaymodeaftertimeout"), +// DISPLAY_MODE_AFTER_TIMEOUT("displayModeAfterTimeout", "naturalTime", "nfpc.itsmtenantconfig.displaymodeaftertimeout"), + SLA_TIME_DISPLAY_MODE("sla.time.display.mode", "naturalTime", "nfpc.itsmtenantconfig.slatimedisplaymode"), PROCESS_TASK_STEP_COMMENT_EDITOR_TOOLBAR_IS_SHOW("processTaskStepCommentEditorToolbarIsShow", "1", "term.itsm.isshowprocesstaskstepcommenteditortoolbar"), ; diff --git a/src/main/java/neatlogic/framework/process/dto/ProcessTaskSlaTimeVo.java b/src/main/java/neatlogic/framework/process/dto/ProcessTaskSlaTimeVo.java index 7197c2b75834f6caa3efdd769538a9a19eb36901..cbe5e20753bbc597e3691957fe7aff9dae8bfee6 100644 --- a/src/main/java/neatlogic/framework/process/dto/ProcessTaskSlaTimeVo.java +++ b/src/main/java/neatlogic/framework/process/dto/ProcessTaskSlaTimeVo.java @@ -33,8 +33,10 @@ public class ProcessTaskSlaTimeVo { @EntityField(name = "上次耗时计算时间点", type = ApiParamType.LONG) private Date calculationTime; private Long calculationTimeLong; - @EntityField(name = "工单时效超时后显示方式", type = ApiParamType.STRING) - private String displayModeAfterTimeout; +// @EntityField(name = "工单时效超时后显示方式", type = ApiParamType.STRING) +// private String displayModeAfterTimeout; + @EntityField(name = "工单时效显示方式", type = ApiParamType.STRING) + private String slaTimeDisplayMode; @EntityField(name = "延迟列表", type = ApiParamType.JSONARRAY) private List delayList; @@ -150,12 +152,20 @@ public class ProcessTaskSlaTimeVo { this.calculationTimeLong = calculationTimeLong; } - public String getDisplayModeAfterTimeout() { - return displayModeAfterTimeout; +// public String getDisplayModeAfterTimeout() { +// return displayModeAfterTimeout; +// } +// +// public void setDisplayModeAfterTimeout(String displayModeAfterTimeout) { +// this.displayModeAfterTimeout = displayModeAfterTimeout; +// } + + public String getSlaTimeDisplayMode() { + return slaTimeDisplayMode; } - public void setDisplayModeAfterTimeout(String displayModeAfterTimeout) { - this.displayModeAfterTimeout = displayModeAfterTimeout; + public void setSlaTimeDisplayMode(String slaTimeDisplayMode) { + this.slaTimeDisplayMode = slaTimeDisplayMode; } public List getDelayList() {