From df7b63ca93cd66c1ed33a350897992c341e4ae5d Mon Sep 17 00:00:00 2001 From: WendyYang Date: Fri, 12 Apr 2024 16:28:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E9=AA=8C=E6=B5=81=E7=A8=8B=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=8D=E5=B1=95=E7=A4=BA=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pm/api/projectlib/handle/stage/PilotRunningHandle.java | 14 +++++++++----- .../pm/api/projectlib/handle/stage/XcfhxReviewHandle.java | 1 - 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/stage/PilotRunningHandle.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/stage/PilotRunningHandle.java index 86eace4..a67bc17 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/stage/PilotRunningHandle.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/stage/PilotRunningHandle.java @@ -37,20 +37,24 @@ public class PilotRunningHandle extends AbstractProcessHandle { } else { Wrapper query = Wrappers.lambdaQuery(ProjectStatusChange.class) .eq(ProjectStatusChange::getProjectCode, ctx.getProject().getProjectCode()) - .eq(ProjectStatusChange::getEvent, ProjectStateChangeEvent.SUBMIT_FIRST_INSPECTED_FILES) + .in(ProjectStatusChange::getEvent, + ProjectStateChangeEvent.SUBMIT_FIRST_INSPECTED_FILES, + ProjectStateChangeEvent.FINAL_ACCEPTANCE_APPLICATION) .orderByDesc(ProjectStatusChange::getCreateOn) .last(BizConst.LIMIT_1); ProjectStatusChange change = projectStatusChangeService.getOne(query); if (change != null) { + if (ProjectStateChangeEvent.SUBMIT_FIRST_INSPECTED_FILES.name().equals(change.getEvent())) { + detail.setStepStatus(StepStatusEnum.ON_GOING); + } else { + detail.setStepStatus(StepStatusEnum.COMPLETED); + } detail.setFinishTime(change.getCreateOn()); - detail.setStepStatus(StepStatusEnum.COMPLETED); - ctx.setPreStepStatus(StepStatusEnum.COMPLETED); } else { detail.setStepStatus(StepStatusEnum.NOT_START); - ctx.setPreStepStatus(StepStatusEnum.NOT_START); } + ctx.setPreStepStatus(detail.getStepStatus()); } - } @Override diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/stage/XcfhxReviewHandle.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/stage/XcfhxReviewHandle.java index 8be486f..575aa89 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/stage/XcfhxReviewHandle.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/handle/stage/XcfhxReviewHandle.java @@ -66,7 +66,6 @@ public class XcfhxReviewHandle extends AbstractProcessHandle { }); StepStatusEnum stepStatus = getPurchaseStatus(detail.getProcessInfoList()); detail.setStepStatus(stepStatus); - ctx.setPreStepStatus(stepStatus); } @Override