From eb956898a09bc9ff881c2f02ef528713490db1fe Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 19 Jul 2024 15:36:33 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=89=A9=E4=BD=99=E6=97=B6=E9=97=B4=E4=B9=9F?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=8E=A7=E5=88=B6=E2=80=98=E8=87=AA=E7=84=B6?= =?UTF-8?q?=E6=97=A5=E2=80=99=E5=92=8C=E2=80=9C=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E2=80=9D=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1204322656813056]后端-工单剩余时间也需要控制‘自然日’和“工作日”展示 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1204322656813056 --- .../process/constvalue/ItsmTenantConfig.java | 3 ++- .../process/dto/ProcessTaskSlaTimeVo.java | 22 ++++++++++++++----- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/main/java/neatlogic/framework/process/constvalue/ItsmTenantConfig.java b/src/main/java/neatlogic/framework/process/constvalue/ItsmTenantConfig.java index 9c4ab970..d92f0d2f 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 7197c2b7..cbe5e207 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() { -- Gitee