From 49c903dd466cb1f0135cc09bf7a831d0444fdf1c Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 19 Jul 2024 15:39:19 +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/notify/handler/param/StepSlaParamHandler.java | 4 ++-- .../module/process/service/ProcessTaskServiceImpl.java | 6 ++++-- .../column/handler/ProcessTaskExpiredTimeColumn.java | 6 ++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepSlaParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepSlaParamHandler.java index 672078f5d..9e1a359ec 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepSlaParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepSlaParamHandler.java @@ -21,7 +21,6 @@ import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.process.dto.ProcessTaskSlaTimeVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; -import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; import neatlogic.framework.util.TimeUtil; import neatlogic.module.process.service.ProcessTaskService; @@ -101,7 +100,8 @@ public class StepSlaParamHandler extends ProcessTaskNotifyParamHandlerBase { jsonObj.put("name", slaTimeVo.getName()); jsonObj.put("status", slaTimeVo.getStatus()); jsonObj.put("timeLeft", slaTimeVo.getTimeLeft()); - if (slaTimeVo.getTimeLeft() > 0 || Objects.equals(slaTimeVo.getDisplayModeAfterTimeout(), "workTime")) { +// if (slaTimeVo.getTimeLeft() > 0 || Objects.equals(slaTimeVo.getDisplayModeAfterTimeout(), "workTime")) { + if (Objects.equals(slaTimeVo.getSlaTimeDisplayMode(), "workTime")) { jsonObj.put("timeLeftFormat", TimeUtil.millisecondsFormat(slaTimeVo.getTimeLeft(), 3, TimeUnit.MINUTES, " ")); } else { jsonObj.put("timeLeftFormat", TimeUtil.millisecondsFormat((System.currentTimeMillis() - slaTimeVo.getExpireTime().getTime()), 3, TimeUnit.MINUTES, " ")); diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java index 843acd476..1937d216e 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java @@ -762,9 +762,11 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC List processTaskList = processTaskMapper.getProcessTaskListByIdList(new ArrayList<>(processTaskIdSet)); Map worktimeUuidMap = processTaskList.stream().collect(Collectors.toMap(ProcessTaskVo::getId, ProcessTaskVo::getWorktimeUuid)); long currentTimeMillis = System.currentTimeMillis(); - String displayModeAfterTimeout = ConfigManager.getConfig(ItsmTenantConfig.DISPLAY_MODE_AFTER_TIMEOUT); +// String displayModeAfterTimeout = ConfigManager.getConfig(ItsmTenantConfig.DISPLAY_MODE_AFTER_TIMEOUT); + String slaTimeDisplayMode = ConfigManager.getConfig(ItsmTenantConfig.SLA_TIME_DISPLAY_MODE); for (ProcessTaskSlaTimeVo processTaskSlaTimeVo : processTaskSlaTimeList) { - processTaskSlaTimeVo.setDisplayModeAfterTimeout(displayModeAfterTimeout); +// processTaskSlaTimeVo.setDisplayModeAfterTimeout(displayModeAfterTimeout); + processTaskSlaTimeVo.setSlaTimeDisplayMode(slaTimeDisplayMode); if (!Objects.equals(SlaStatus.DOING.name().toLowerCase(), processTaskSlaTimeVo.getStatus())) { continue; } diff --git a/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskExpiredTimeColumn.java b/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskExpiredTimeColumn.java index f2f08691e..d3d23309c 100644 --- a/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskExpiredTimeColumn.java +++ b/src/main/java/neatlogic/module/process/workcenter/column/handler/ProcessTaskExpiredTimeColumn.java @@ -97,7 +97,8 @@ public class ProcessTaskExpiredTimeColumn extends ProcessTaskColumnBase implemen List processTaskSlaList = processTaskVo.getProcessTaskSlaVoList(); JSONArray resultArray = new JSONArray(); if (ProcessTaskStatus.RUNNING.getValue().equals(processTaskVo.getStatus()) && CollectionUtils.isNotEmpty(processTaskSlaList)) { - String displayModeAfterTimeout = ConfigManager.getConfig(ItsmTenantConfig.DISPLAY_MODE_AFTER_TIMEOUT); +// String displayModeAfterTimeout = ConfigManager.getConfig(ItsmTenantConfig.DISPLAY_MODE_AFTER_TIMEOUT); + String slaTimeDisplayMode = ConfigManager.getConfig(ItsmTenantConfig.SLA_TIME_DISPLAY_MODE); long currentTimeMillis = System.currentTimeMillis(); for (ProcessTaskSlaVo slaVo : processTaskSlaList) { //判断需要 同时满足 该步骤是进行中状态，以及包含sla策略 @@ -107,7 +108,8 @@ public class ProcessTaskExpiredTimeColumn extends ProcessTaskColumnBase implemen continue; } JSONObject tmpJson = new JSONObject(); - tmpJson.put(ItsmTenantConfig.DISPLAY_MODE_AFTER_TIMEOUT.getKey(), displayModeAfterTimeout); +// tmpJson.put(ItsmTenantConfig.DISPLAY_MODE_AFTER_TIMEOUT.getKey(), displayModeAfterTimeout); + tmpJson.put("slaTimeDisplayMode", slaTimeDisplayMode); ProcessTaskSlaTimeVo slaTimeVo = slaVo.getSlaTimeVo(); if (slaTimeVo == null) { continue; -- Gitee