终验流程状态不展示修复

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<ProjectStatusChange> 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

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