修复终验审核通过项目状态变更失败

hz-pm-api/src/main/java/com/hz/pm/api/common/helper/WflowHelper.java

@@ -97,7 +97,7 @@ public class WflowHelper {
                                 .singleResult();
                     }).filter(w -> w != null && "PASS".equals(w.getValue().toString()))
                     .collect(Collectors.toList());
-            if (userTaskDefineNode.getLoopCharacteristics().isSequential()) {
+            if (!userTaskDefineNode.getLoopCharacteristics().isSequential()) {
                 if (variableInstances.isEmpty()) {
                     return Boolean.FALSE;
                 }

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/action/ProjectStateChangeAction.java

@@ -255,13 +255,6 @@ public class ProjectStateChangeAction {
         project.setStatus(ProjectStatusEnum.TO_BE_APPROVED.getCode());
     }
 
-
-    @OnTransition(source = "UNDER_CONSTRUCTION", target = "TO_BE_FINALLY_INSPECTED")
-    public void PRELIMINARY_ACCEPTANCE_PUT_ON_RECORD(Message<ProjectStateChangeEvent> message) {
-        Project project = getProject(message);
-        project.setStatus(ProjectStatusEnum.TO_BE_FINALLY_INSPECTED.getCode());
-    }
-
     @OnTransition(source = "UNDER_CONSTRUCTION", target = "TO_BE_PURCHASED")
     public void UNDER_CONSTRUCTION_WITHDRAW(Message<ProjectStateChangeEvent> message) {
         Project project = getProject(message);
@@ -286,20 +279,13 @@ public class ProjectStateChangeAction {
         project.setStatus(ProjectStatusEnum.ON_PILOT_RUNNING.getCode());
     }
 
-    @OnTransition(source = "ON_PILOT_RUNNING", target = "FINAL_ACCEPTANCE_IS_UNDER_REVIEW")
+    @OnTransition(source = "ON_PILOT_RUNNING", target = "ON_FINALLY_INSPECTED")
     public void FINAL_ACCEPTANCE_APPLICATION(Message<ProjectStateChangeEvent> message) {
         Project project = getProject(message);
-        project.setStatus(ProjectStatusEnum.FINAL_ACCEPTANCE_IS_UNDER_REVIEW.getCode());
-    }
-
-    @OnTransition(source = "TO_BE_FINALLY_INSPECTED", target = "UNDER_CONSTRUCTION")
-    public void TO_BE_FINALLY_INSPECTED_WITHDRAW(Message<ProjectStateChangeEvent> message) {
-        Project project = getProject(message);
-        project.setStatus(ProjectStatusEnum.UNDER_CONSTRUCTION.getCode());
+        project.setStatus(ProjectStatusEnum.ON_FINALLY_INSPECTED.getCode());
     }
 
-
-    @OnTransition(source = "FINAL_ACCEPTANCE_IS_UNDER_REVIEW", target = "ARCHIVED")
+    @OnTransition(source = "ON_FINALLY_INSPECTED", target = "ARCHIVED")
     public void FINAL_ACCEPTANCE_PASS(Message<ProjectStateChangeEvent> message) {
         Project project = getProject(message);
         // 终验审核通过后，项目一级状态变更为已归档
@@ -307,22 +293,16 @@ public class ProjectStateChangeAction {
         project.setStatus(ProjectStatusEnum.ACCEPTED.getCode());
     }
 
-    @OnTransition(source = "FINAL_ACCEPTANCE_IS_UNDER_REVIEW", target = "FINAL_ACCEPTANCE_REVIEW_FAILED")
+    @OnTransition(source = "ON_FINALLY_INSPECTED", target = "FINALLY_INSPECTED_FAILED")
     public void FINAL_ACCEPTANCE_REJECT(Message<ProjectStateChangeEvent> message) {
         Project project = getProject(message);
-        project.setStatus(ProjectStatusEnum.FINAL_ACCEPTANCE_REVIEW_FAILED.getCode());
-    }
-
-    @OnTransition(source = "FINAL_ACCEPTANCE_IS_UNDER_REVIEW", target = "TO_BE_FINALLY_INSPECTED")
-    public void FINAL_ACCEPTANCE_IS_UNDER_REVIEW_WITHDRAW(Message<ProjectStateChangeEvent> message) {
-        Project project = getProject(message);
-        project.setStatus(ProjectStatusEnum.TO_BE_FINALLY_INSPECTED.getCode());
+        project.setStatus(ProjectStatusEnum.FINALLY_INSPECTED_FAILED.getCode());
     }
 
-    @OnTransition(source = "FINAL_ACCEPTANCE_REVIEW_FAILED", target = "FINAL_ACCEPTANCE_IS_UNDER_REVIEW")
+    @OnTransition(source = "FINALLY_INSPECTED_FAILED", target = "ON_FINALLY_INSPECTED")
     public void FINAL_RE_ACCEPTANCE_APPLICATION(Message<ProjectStateChangeEvent> message) {
         Project project = getProject(message);
-        project.setStatus(ProjectStatusEnum.FINAL_ACCEPTANCE_IS_UNDER_REVIEW.getCode());
+        project.setStatus(ProjectStatusEnum.ON_FINALLY_INSPECTED.getCode());
     }
 
 }

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/builder/impl/ProjectStateMachineBuilderImpl.java

@@ -128,7 +128,6 @@ public class ProjectStateMachineBuilderImpl implements BaseStateMachineBuilder<P
                 .source(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS)
                 .target(ProjectStatusEnum.PENDING_PREQUALIFICATION)
                 .event(ProjectStateChangeEvent.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS_WITHDRAW).and()
-
                 // 预审通过，从预审中到部门联审中
                 .withExternal()
                 .source(ProjectStatusEnum.PRE_APPLYING)
@@ -250,27 +249,27 @@ public class ProjectStateMachineBuilderImpl implements BaseStateMachineBuilder<P
                 // 待终验终验申请，从待终验到终验审核中
                 .withExternal()
                 .source(ProjectStatusEnum.ON_PILOT_RUNNING)
-                .target(ProjectStatusEnum.FINAL_ACCEPTANCE_IS_UNDER_REVIEW)
+                .target(ProjectStatusEnum.ON_FINALLY_INSPECTED)
                 .event(ProjectStateChangeEvent.FINAL_ACCEPTANCE_APPLICATION).and()
                 // 终审审核通过，从终审审核中到已归档
                 .withExternal()
-                .source(ProjectStatusEnum.FINAL_ACCEPTANCE_IS_UNDER_REVIEW)
+                .source(ProjectStatusEnum.ON_FINALLY_INSPECTED)
                 .target(ProjectStatusEnum.ARCHIVED)
                 .event(ProjectStateChangeEvent.FINAL_ACCEPTANCE_PASS).and()
                 // 终审审核不通过，从终审审核中到终审审核不通过
                 .withExternal()
-                .source(ProjectStatusEnum.FINAL_ACCEPTANCE_IS_UNDER_REVIEW)
-                .target(ProjectStatusEnum.FINAL_ACCEPTANCE_REVIEW_FAILED)
+                .source(ProjectStatusEnum.ON_FINALLY_INSPECTED)
+                .target(ProjectStatusEnum.FINALLY_INSPECTED_FAILED)
                 .event(ProjectStateChangeEvent.FINAL_ACCEPTANCE_REJECT).and()
                 // 终审审核中撤回，从终审审核中到待终验
                 .withExternal()
-                .source(ProjectStatusEnum.FINAL_ACCEPTANCE_IS_UNDER_REVIEW)
-                .target(ProjectStatusEnum.TO_BE_FINALLY_INSPECTED)
+                .source(ProjectStatusEnum.ON_FINALLY_INSPECTED)
+                .target(ProjectStatusEnum.ON_PILOT_RUNNING)
                 .event(ProjectStateChangeEvent.FINAL_ACCEPTANCE_IS_UNDER_REVIEW_WITHDRAW).and()
                 // 终验中 重新提交
                 .withExternal()
-                .source(ProjectStatusEnum.FINAL_ACCEPTANCE_REVIEW_FAILED)
-                .target(ProjectStatusEnum.FINAL_ACCEPTANCE_IS_UNDER_REVIEW)
+                .source(ProjectStatusEnum.FINALLY_INSPECTED_FAILED)
+                .target(ProjectStatusEnum.ON_FINALLY_INSPECTED)
                 .event(ProjectStateChangeEvent.FINAL_RE_ACCEPTANCE_APPLICATION).and();
         return builder.build();
     }

hz-pm-api/src/main/java/com/hz/pm/api/common/statemachine/event/ProjectStateChangeEvent.java

@@ -155,11 +155,11 @@ public enum ProjectStateChangeEvent implements AbstractStateChangeEvent {
     /**
      * 终验审核不通过(项目状态变为：终验审核不通过)
      */
-    FINAL_ACCEPTANCE_REJECT(null, ProjectStatusEnum.FINAL_ACCEPTANCE_IS_UNDER_REVIEW.getCode(), null),
+    FINAL_ACCEPTANCE_REJECT(null, ProjectStatusEnum.ON_FINALLY_INSPECTED.getCode(), null),
     /**
      * 终验审核通过(项目状态变为：已归档)
      */
-    FINAL_ACCEPTANCE_PASS(ProjectStatusEnum.FINAL_ACCEPTANCE_IS_UNDER_REVIEW.getCode(), null, null),
+    FINAL_ACCEPTANCE_PASS(ProjectStatusEnum.ON_FINALLY_INSPECTED.getCode(), null, null),
 
     // 下个节点还未提交审核意见时，流程发起人和前一个审核人可以点击撤回
 
@@ -186,12 +186,12 @@ public enum ProjectStateChangeEvent implements AbstractStateChangeEvent {
     /**
      * 终验审核中时被撤回(项目状态进入：待终验)
      */
-    FINAL_ACCEPTANCE_IS_UNDER_REVIEW_WITHDRAW(null, null, ProjectStatusEnum.FINAL_ACCEPTANCE_IS_UNDER_REVIEW.getCode()),
+    FINAL_ACCEPTANCE_IS_UNDER_REVIEW_WITHDRAW(null, null, ProjectStatusEnum.ON_FINALLY_INSPECTED.getCode()),
 
     /**
      * 重新提交 终验
      */
-    FINAL_RE_ACCEPTANCE_APPLICATION(ProjectStatusEnum.FINAL_ACCEPTANCE_REVIEW_FAILED.getCode(), null, null);
+    FINAL_RE_ACCEPTANCE_APPLICATION(ProjectStatusEnum.FINALLY_INSPECTED_FAILED.getCode(), null, null);
 
 
     private final Integer passStatusCode;

hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java

@@ -868,7 +868,7 @@ public class MeetingManage {
                 buildOptionProjectQuery(query, meetingType, ProjectStatusEnum.SCHEME_UNDER_REVIEW);
                 break;
             case ACCEPTANCE_SCHEME_REVIEW:
-                buildOptionProjectQuery(query, meetingType, ProjectStatusEnum.FINAL_ACCEPTANCE_IS_UNDER_REVIEW);
+                buildOptionProjectQuery(query, meetingType, ProjectStatusEnum.ON_FINALLY_INSPECTED);
                 break;
             case DEPT_JOIN_REVIEW:
                 buildOptionProjectQuery(query, meetingType, ProjectStatusEnum.DEPARTMENT_JOINT_REVIEW);

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/DelayedApplyManage.java

@@ -102,7 +102,7 @@ public class DelayedApplyManage {
         // 待终验 并且已经过期
         // 只能看自己单位的
         query.eq(Project::getBuildOrgCode, user.getMhUnitIdStr());
-        query.eq(Project::getStatus, ProjectStatusEnum.TO_BE_FINALLY_INSPECTED.getCode());
+        query.eq(Project::getStatus, ProjectStatusEnum.ON_PILOT_RUNNING.getCode());
         query.eq(Project::getStage, ProjectStatusEnum.PROJECT_APPROVED.getCode());
         query.lt(Project::getPlanAcceptanceTime, LocalDateTime.now());
         query.eq(Project::getNewest, Boolean.TRUE);
@@ -172,7 +172,7 @@ public class DelayedApplyManage {
         // 待终验
         // 只能看自己单位的
         query.eq(Project::getBuildOrgCode, user.getMhUnitId());
-        query.eq(Project::getStatus, ProjectStatusEnum.TO_BE_FINALLY_INSPECTED.getCode());
+        query.eq(Project::getStatus, ProjectStatusEnum.ON_PILOT_RUNNING.getCode());
         query.eq(Project::getStage, ProjectStatusEnum.PROJECT_APPROVED.getCode());
         query.eq(Project::getNewest, Boolean.TRUE);
         query.isNotNull(Project::getApprovalDate);
@@ -224,7 +224,7 @@ public class DelayedApplyManage {
         Assert.notNull(project, "提交失败 此项目不存在!");
 
         //首先要判断 项目当前状态 是不是 以终验
-        VUtils.isTrue(!ProjectStatusEnum.TO_BE_FINALLY_INSPECTED.eq(project.getStatus()) ||
+        VUtils.isTrue(!ProjectStatusEnum.ON_PILOT_RUNNING.eq(project.getStatus()) ||
                         !ProjectStatusEnum.PROJECT_APPROVED.eq(project.getStage()))
                 .throwMessage("提交失败 该项目不是 已立项|待终验");
 
@@ -249,7 +249,7 @@ public class DelayedApplyManage {
         VUtils.isTrue(Objects.isNull(project)).throwMessage("提交失败 此项目不存在!");
 
         //首先要判断 项目当前状态 是不是 以终验
-        VUtils.isTrue(!ProjectStatusEnum.TO_BE_FINALLY_INSPECTED.eq(project.getStatus()) ||
+        VUtils.isTrue(!ProjectStatusEnum.ON_PILOT_RUNNING.eq(project.getStatus()) ||
                         !ProjectStatusEnum.PROJECT_APPROVED.eq(project.getStage()))
                 .throwMessage("提交失败 该项目不是 已立项|待终验");
 

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/FinalAcceptanceManage.java

@@ -181,7 +181,7 @@ public class FinalAcceptanceManage {
         //待终验
         //只能看自己单位的
         query.eq(Project::getBuildOrgCode, user.getMhUnitId());
-        query.eq(Project::getStatus, ProjectStatusEnum.TO_BE_FINALLY_INSPECTED.getCode());
+        query.eq(Project::getStatus, ProjectStatusEnum.ON_PILOT_RUNNING.getCode());
         query.eq(Project::getStage, ProjectStatusEnum.PROJECT_APPROVED.getCode());
         query.eq(Project::getNewest, Boolean.TRUE);
         query.isNotNull(Project::getApprovalDate);
@@ -288,7 +288,7 @@ public class FinalAcceptanceManage {
         projectInst.setProjectId(req.getProjectId());
         projectInstService.save(projectInst);
 
-        if (ProjectStatusEnum.TO_BE_FINALLY_INSPECTED.eq(project.getStatus())) {
+        if (ProjectStatusEnum.ON_PILOT_RUNNING.eq(project.getStatus())) {
             // 判断是否所有标段已经进行过终验申报 无论是否通过
             LambdaQueryWrapper<PurchaseInst> purchaseInstQuery = Wrappers.lambdaQuery(PurchaseInst.class)
                     .select(PurchaseInst::getBidId)

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/AnnualPlanLibManage.java

@@ -13,24 +13,24 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Assert;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
-import com.hz.pm.api.common.model.constant.CommonConst;
 import com.hz.pm.api.common.enumeration.CommonEnum;
 import com.hz.pm.api.common.helper.UserInfoHelper;
+import com.hz.pm.api.common.model.constant.CommonConst;
 import com.hz.pm.api.common.model.entity.ExcelExportWriter;
 import com.hz.pm.api.common.statemachine.util.ProjectStateMachineUtil;
 import com.hz.pm.api.common.util.BizUtils;
 import com.hz.pm.api.common.util.ExcelDownUtil;
 import com.hz.pm.api.datascope.model.DataScopeDTO;
 import com.hz.pm.api.datascope.utils.DataScopeUtil;
-import com.hz.pm.api.projectlib.model.enumeration.ProjectLibFlagEnum;
-import com.hz.pm.api.projectlib.model.enumeration.ProjectRenewalApprovalStatusEnum;
-import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.helper.ProjectHelper;
 import com.hz.pm.api.projectlib.model.dto.AnnualLibExportDTO;
 import com.hz.pm.api.projectlib.model.dto.AnnualLibImportDTO;
 import com.hz.pm.api.projectlib.model.dto.ProjectDTO;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.model.entity.ProjectRenewalFundDeclaration;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectLibFlagEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectRenewalApprovalStatusEnum;
+import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
 import com.hz.pm.api.projectlib.model.req.ProjectApprovedReq;
 import com.hz.pm.api.projectlib.model.req.ProjectIdReq;
 import com.hz.pm.api.projectlib.model.req.ProjectListReq;
@@ -92,7 +92,7 @@ public class AnnualPlanLibManage {
     private static final List<ProjectStatusEnum> ANNUAL_PLAN_LIST_STATUS =
             Arrays.asList(IN_THE_ANNUAL_PLAN, SCHEME_UNDER_REVIEW, SCHEME_REVIEW_FAILED, TO_BE_APPROVED, TO_BE_DECLARED,
                     PLAN_TO_BE_DECLARED, PENDING_PREQUALIFICATION_CHOICE, PROJECT_APPROVED, TO_BE_PURCHASED, UNDER_CONSTRUCTION,
-                    TO_BE_FINALLY_INSPECTED, FINAL_ACCEPTANCE_IS_UNDER_REVIEW, FINAL_ACCEPTANCE_REVIEW_FAILED, ARCHIVED);
+                    ON_PILOT_RUNNING, ARCHIVED);
 
     public PageVo<AnnualPlanListItemVO> annulPlanLibList(ProjectListReq req) {
         LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(req);

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/enumeration/ProjectStatusEnum.java

@@ -59,12 +59,10 @@ public enum ProjectStatusEnum {
     TO_BE_PURCHASED(20001, "待采购", GovProjectStatusEnum.APPROVED),
     ON_PURCHASING(20007, "采购中", GovProjectStatusEnum.APPROVED),
     UNDER_CONSTRUCTION(20002, "建设中", null),
-    TO_BE_FINALLY_INSPECTED(20003, "待终验", GovProjectStatusEnum.HAS_PRE_INS),
-    ON_FINALLY_INSPECTED(20010, "终验中", GovProjectStatusEnum.HAS_PRE_INS),
     TO_BE_FIRST_INSPECTED(20008, "待初验", null),
     ON_PILOT_RUNNING(20009, "试运行中", null),
-    FINAL_ACCEPTANCE_IS_UNDER_REVIEW(20004, "终验审核中", null),
-    FINAL_ACCEPTANCE_REVIEW_FAILED(20005, "终验审核不通过", null),
+    ON_FINALLY_INSPECTED(20004, "终验审核中", null),
+    FINALLY_INSPECTED_FAILED(20005, "终验审核不通过", null),
     /**
      * 项目阶段：已归档
      */

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/enumeration/WarningFlowTypeEnum.java

@@ -24,7 +24,7 @@ public enum WarningFlowTypeEnum {
     PRELIMINARY_PREVIEW(2, "建设方案申报",ProjectStatusEnum.PLAN_TO_BE_DECLARED.getCode(),"declareManage/constructionPlanDeclare"),
     DEPT_UNITED_REVIEW(3,"采购结果备案",ProjectStatusEnum.TO_BE_PURCHASED.getCode(),"declareManage/procurementRecord/purchaseResults"),
     CONSTRUCTION_PLAN_REVIEW(4,"初验备案",ProjectStatusEnum.UNDER_CONSTRUCTION.getCode(),"declareManage/acceptanceApply/initialInspectionRecord"),
-    PROJECT_FINAL_INSPECTION(5,"验收申报",ProjectStatusEnum.TO_BE_FINALLY_INSPECTED.getCode(),"declareManage/acceptanceApply/finalInspectionDeclare");
+    PROJECT_FINAL_INSPECTION(5,"验收申报",ProjectStatusEnum.ON_PILOT_RUNNING.getCode(),"declareManage/acceptanceApply/finalInspectionDeclare");
 
     private Integer code;
     private String desc;

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/model/enumeration/WarningOperationTypeEnum.java

@@ -1,6 +1,5 @@
 package com.hz.pm.api.projectlib.model.enumeration;
 
-import io.swagger.models.auth.In;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -9,8 +8,8 @@ import org.apache.commons.lang3.StringUtils;
 import java.util.Objects;
 
 /**
- *
  * 预警填报类型枚举
+ *
  * @author CMM
  * @since 2023/02/24 16:14
  */
@@ -21,8 +20,8 @@ public enum WarningOperationTypeEnum {
     /**
      * 预警实施类型枚举
      */
-    CHUYAN(1, "项目初验",ProjectStatusEnum.UNDER_CONSTRUCTION.getCode(),"declareManage/acceptanceApply/initialInspectionRecord"),
-    ZHONGYAN(2, "项目终验",ProjectStatusEnum.TO_BE_FINALLY_INSPECTED.getCode(),"declareManage/acceptanceApply/finalInspectionDeclare");
+    CHUYAN(1, "项目初验", ProjectStatusEnum.UNDER_CONSTRUCTION.getCode(), "declareManage/acceptanceApply/initialInspectionRecord"),
+    ZHONGYAN(2, "项目终验", ProjectStatusEnum.ON_PILOT_RUNNING.getCode(), "declareManage/acceptanceApply/finalInspectionDeclare");
 
     private Integer code;
     private String desc;
@@ -56,7 +55,7 @@ public enum WarningOperationTypeEnum {
         return null;
     }
 
-    public boolean eq(Integer code){
+    public boolean eq(Integer code) {
         return this.getCode().equals(code);
     }
 

hz-pm-api/src/main/java/com/hz/pm/api/scheduler/listener/ProcessEndListener.java

@@ -7,16 +7,13 @@ import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.model.entity.ProjectInst;
 import com.hz.pm.api.projectlib.model.enumeration.InstTypeEnum;
 import com.hz.pm.api.projectlib.model.enumeration.ProjectStatusEnum;
-import com.hz.pm.api.projectlib.service.IProjectApplicationService;
 import com.hz.pm.api.projectlib.service.IProjectInstService;
 import com.hz.pm.api.projectlib.service.IProjectService;
-import com.hz.pm.api.provincial.service.IJoinReviewProvincialBureauService;
 import com.hz.pm.api.staging.enums.MsgTypeEnum;
 import com.hz.pm.api.staging.service.IProjectStagingService;
 import com.hz.pm.api.sys.manage.NoticeManage;
 import com.hz.pm.api.todocenter.manage.HandlerManage;
 import com.ningdatech.basic.exception.BizException;
-import com.ningdatech.file.service.FileService;
 import com.wflow.contants.HisProInsEndActId;
 import com.wflow.workflow.bean.process.ProgressNode;
 import com.wflow.workflow.bean.process.enums.NodeTypeEnum;
@@ -189,8 +186,6 @@ public class ProcessEndListener {
                     case DEPARTMENT_JOINT_REVIEW:
                         // 当前项目状态是方案评审中
                     case SCHEME_UNDER_REVIEW:
-                        // 当前项目状态是终验审核中
-                    case FINAL_ACCEPTANCE_IS_UNDER_REVIEW:
                         handlerManage.updatePassProjectStatus(0L, project);
                         break;
                     default:

hz-pm-api/src/main/java/com/hz/pm/api/todocenter/manage/HandlerManage.java

@@ -201,8 +201,6 @@ public class HandlerManage {
                     case UNDER_INTERNAL_AUDIT:
                         //  立项备案审批
                     case DECLARED_APPROVED_RECORD_AUDITING:
-                        // 当前项目状态是方案评审中
-                    case FINAL_ACCEPTANCE_IS_UNDER_REVIEW:
                         updatePassProjectStatus(userId, project);
                         break;
                     case SCHEME_UNDER_REVIEW:
@@ -214,7 +212,6 @@ public class HandlerManage {
                     case ON_PURCHASING:
                     case TO_BE_FIRST_INSPECTED:
                     case ON_PILOT_RUNNING:
-                    case TO_BE_FINALLY_INSPECTED:
                     case ON_FINALLY_INSPECTED:
                         ProjectProcessStageEnum processStage = ProjectProcessStageEnum.get(instTypeEnum.getCode())
                                 .orElseThrow(() -> BizException.wrap("不支持的流程类型"));
@@ -447,8 +444,6 @@ public class HandlerManage {
             case DEPARTMENT_JOINT_REVIEW:
                 // 当前项目状态是方案评审中
             case SCHEME_UNDER_REVIEW:
-                // 当前项目状态是终验审核中
-            case FINAL_ACCEPTANCE_IS_UNDER_REVIEW:
                 updateWithdrawProjectStatus(userId, declaredProject);
                 break;
             default: