项目阶段debug

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/ProcessExecuteChainHandle.java

@@ -56,15 +56,15 @@ public class ProcessExecuteChainHandle {
         for (AbstractProcessBusinessHandle processBusinessHandle : processBusinessHandles) {
             if(Objects.nonNull(project) && RegionContant.LS_LQ_CODE.equals(project.getAreaCode())) {
                 if(processBusinessHandle instanceof AnnualPlanHandle){
-                    processBusinessHandle.setOrder(5);
-                }else if(processBusinessHandle instanceof ConstructionPlanReviewHandle){
                     processBusinessHandle.setOrder(6);
+                }else if(processBusinessHandle instanceof ConstructionPlanReviewHandle){
+                    processBusinessHandle.setOrder(5);
                 }
             }else{
                 if(processBusinessHandle instanceof AnnualPlanHandle){
-                    processBusinessHandle.setOrder(6);
-                }else if(processBusinessHandle instanceof ConstructionPlanReviewHandle){
                     processBusinessHandle.setOrder(5);
+                }else if(processBusinessHandle instanceof ConstructionPlanReviewHandle){
+                    processBusinessHandle.setOrder(6);
                 }
             }
             if(processBusinessHandle instanceof ConstructionPlanReviewHandle){

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/ProjectApprovalHandle.java

@@ -95,9 +95,9 @@ public class ProjectApprovalHandle extends AbstractProcessBusinessHandle {
         } else {
             // 取 状态机 改变状态时间
             ProjectStatusChange projectStatusChange = projectStatusChangeService.getOne(Wrappers.lambdaQuery(ProjectStatusChange.class)
-                    .eq(ProjectStatusChange::getProjectId, projectId)
+                    .in(ProjectStatusChange::getProjectId, allVersionProjectIds)
                     .eq(ProjectStatusChange::getEvent, ProjectStatusChangeEvent.PROJECT_APPROVAL.name())
-                    .last("limit 1"));
+                    .last(BizConst.LIMIT_1));
             if (Objects.nonNull(projectStatusChange)) {
                 processDetailVO.setFinishTime(projectStatusChange.getCreateOn());
                 processDetailVO.setStepStatus(StepStatusEnum.COMPLETED);