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 672078f5d40afdbadfc8002466f2dac49dc74b6c..9e1a359eccc1c3d8b48a37039cdac9198235bb79 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 843acd476cb572f4af224dbebe7523e3ee220375..1937d216eb84429674079a2e924edc88ef6d4543 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 f2f08691e55c315e42f4b812085aa97f546d08bd..d3d23309c24c19cee356f8e4a591beaaa3da55a2 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;