From 4e9c6ee04e9c865064f61dc01f5e3517936bb88d Mon Sep 17 00:00:00 2001 From: WendyYang Date: Thu, 16 Jan 2025 14:16:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=201.=20=E9=A1=B9=E7=9B=AE=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E6=9D=A1=E5=85=BC=E5=AE=B9=E5=8E=86=E5=8F=B2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hz/pm/api/projectlib/handle/stage/XcfhxReviewHandle.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 5ca5862..80558ec 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 @@ -1,11 +1,9 @@ package com.hz.pm.api.projectlib.handle.stage; -import com.hz.pm.api.common.statemachine.event.ProjectStateChangeEvent; import com.hz.pm.api.projectdeclared.model.entity.Purchase; import com.hz.pm.api.projectdeclared.model.entity.PurchaseInst; import com.hz.pm.api.projectlib.handle.AbstractProcessHandle; import com.hz.pm.api.projectlib.handle.HandleParamContext; -import com.hz.pm.api.projectlib.model.entity.ProjectStatusChange; import com.hz.pm.api.projectlib.model.enumeration.InstTypeEnum; import com.wflow.workflow.bean.vo.ProcessDetailVO; import com.wflow.workflow.bean.vo.ProcessInfoVO; @@ -68,9 +66,11 @@ public class XcfhxReviewHandle extends AbstractProcessHandle { }); StepStatusEnum stepStatus = getPurchaseStatus(detail.getProcessInfoList()); detail.setStepStatus(stepStatus); - ProjectStatusChange finalAcceptChange = ctx.getProjectStateChange(ProjectStateChangeEvent.FINAL_ACCEPTANCE_APPLICATION); - if (finalAcceptChange != null) { - detail.setStepStatus(StepStatusEnum.COMPLETED); + Map finalAcceptInst = getPurchaseInstMap(ctx.getPurchaseInstList(), purchaseMap.keySet(), InstTypeEnum.PROJECT_FINAL_INSPECTION); + if (StepStatusEnum.COMPLETED.equals(stepStatus) || !finalAcceptInst.isEmpty()) { + ctx.setPreStepStatus(StepStatusEnum.COMPLETED); + } else { + ctx.setPreStepStatus(stepStatus); } }