From 8e8982583967075f7d91a173fd9657f8bed4008e Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 8 Aug 2024 18:35:26 +0800 Subject: [PATCH 1/2] =?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=E4=B8=AD=E5=BF=83=E5=89=A9=E4=BD=99=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=8C=89=E8=87=AA=E7=84=B6=E6=97=A5=E5=92=8C=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=97=A5=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1217326366556160]后端-工单中心剩余时间按自然日和工作日显示 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1217326366556160 --- .../api/processtask/ProcessTaskStepListApi.java | 11 +++++++++++ .../column/handler/ProcessTaskExpiredTimeColumn.java | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java index c1d235960..d73f97927 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java @@ -9,6 +9,7 @@ import neatlogic.framework.exception.type.PermissionDeniedException; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessStepType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepStatus; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException; import neatlogic.framework.process.exception.process.ProcessStepHandlerNotFoundException; @@ -115,6 +116,16 @@ public class ProcessTaskStepListApi extends PrivateApiComponentBase { } } } + for (ProcessTaskStepVo processTaskStepVo : resultList) { + processTaskStepVo.setIsInTheCurrentStepTab(0); + if (Objects.equals(processTaskStepVo.getIsActive(), 1)) { + if (Objects.equals(processTaskStepVo.getStatus(), ProcessTaskStepStatus.PENDING.getValue()) + || Objects.equals(processTaskStepVo.getStatus(), ProcessTaskStepStatus.RUNNING.getValue()) + || Objects.equals(processTaskStepVo.getStatus(), ProcessTaskStepStatus.HANG.getValue())) { + processTaskStepVo.setIsInTheCurrentStepTab(1); + } + } + } resultList.sort(Comparator.comparing(ProcessTaskStepVo::getActiveTime)); return resultList; } 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 1b8be0485..08e59586e 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 @@ -93,13 +93,13 @@ public class ProcessTaskExpiredTimeColumn extends ProcessTaskColumnBase implemen public Object getValue(ProcessTaskVo processTaskVo) { List processTaskSlaList = processTaskVo.getProcessTaskSlaVoList(); JSONArray resultArray = new JSONArray(); - if (ProcessTaskStatus.RUNNING.getValue().equals(processTaskVo.getStatus()) && CollectionUtils.isNotEmpty(processTaskSlaList)) { + if ((ProcessTaskStatus.RUNNING.getValue().equals(processTaskVo.getStatus()) || ProcessTaskStatus.HANG.getValue().equals(processTaskVo.getStatus())) && CollectionUtils.isNotEmpty(processTaskSlaList)) { // 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策略 - if (processTaskVo.getStepList().stream().noneMatch(o -> (Objects.equals(o.getStatus(), ProcessTaskStepStatus.RUNNING.getValue()) || (Objects.equals(o.getStatus(), ProcessTaskStepStatus.PENDING.getValue()) && o.getIsActive() == 1)) + if (processTaskVo.getStepList().stream().noneMatch(o -> (Objects.equals(o.getStatus(), ProcessTaskStepStatus.RUNNING.getValue()) || (Objects.equals(o.getStatus(), ProcessTaskStepStatus.PENDING.getValue()) && o.getIsActive() == 1) || (Objects.equals(o.getStatus(), ProcessTaskStepStatus.HANG.getValue()) && o.getIsActive() == 1)) && CollectionUtils.isNotEmpty(o.getSlaTimeList()) && o.getSlaTimeList().stream().anyMatch(c -> Objects.equals(c.getSlaId(), slaVo.getId())))) { continue; @@ -133,6 +133,7 @@ public class ProcessTaskExpiredTimeColumn extends ProcessTaskColumnBase implemen tmpJson.put("realExpireTime", realExpireTimeLong); } tmpJson.put("slaName", slaVo.getName()); + tmpJson.put("status", status); //获取即将超时规则，默认分钟（从超时通知策略获取） JSONObject configJson = slaVo.getConfigObj(); if (configJson.containsKey("notifyPolicyList") && CollectionUtils.isNotEmpty(configJson.getJSONArray("notifyPolicyList"))) { -- Gitee From c724191a0e74b605897850a740b108086aba4f01 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 8 Aug 2024 19:22:48 +0800 Subject: [PATCH 2/2] =?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=E4=B8=AD=E5=BF=83=E5=89=A9=E4=BD=99=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=8C=89=E8=87=AA=E7=84=B6=E6=97=A5=E5=92=8C=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=97=A5=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1217326366556160]后端-工单中心剩余时间按自然日和工作日显示 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1217326366556160 --- .../neatlogic/module/process/service/ProcessTaskServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java index 36372385f..f6d23c419 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java @@ -2591,6 +2591,7 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC } else { jsonObj.put("owner", null); } + // 为了兼容第三方上报接口认证，当owner与当前登录用户不一致时，无须校验reporter必填 String reporter = jsonObj.getString("reporter"); if (StringUtils.isNotBlank(reporter)) { if (reporter.contains("#")) { -- Gitee