From f2c7f430d794de225424e9efbf6314244b45777b Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 25 Sep 2024 16:32:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=8A=B6=E6=80=81=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../laws/enterprise/job/ESPlanProjectStatusJob.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESPlanProjectStatusJob.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESPlanProjectStatusJob.java index cfa6b5a5..01706148 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESPlanProjectStatusJob.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESPlanProjectStatusJob.java @@ -50,6 +50,8 @@ public class ESPlanProjectStatusJob implements Job { } public void updatePlanProjectStatus(List list) { + List idList = list.stream().map(EnterpriseStandardPlan::getId).collect(Collectors.toList()); + list = espService.listByIds(idList); // 将list中的时间的时分秒都去掉 list.forEach(esp -> { if (null != esp.getApprovalDate()) { @@ -99,7 +101,13 @@ public class ESPlanProjectStatusJob implements Job { if (processAlls.isEmpty()) { p.setProjectStatus(ESPProjectStatus.NOT_STARTED.getValue()); } else { - p.setProjectStatus(ESPProjectStatus.IN_PROGRESS.getValue()); + // 判断是否都是进行中或者都是已完成 + boolean inProgress = processAlls.stream().anyMatch(processAll -> ProcessStatusEnum.INCOMPLETE.getValue().equals(processAll.getPrcStatus())); + if (inProgress) { + p.setProjectStatus(ESPProjectStatus.IN_PROGRESS.getValue()); + } else { + p.setProjectStatus(ESPProjectStatus.COMPLETED.getValue()); + } } } });