diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/helper/ProjectChangeStopHelper.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/helper/ProjectChangeStopHelper.java index dad7310..4ae3f64 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/helper/ProjectChangeStopHelper.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/helper/ProjectChangeStopHelper.java @@ -134,7 +134,7 @@ public class ProjectChangeStopHelper { TenderStateChangeEvent tenderEvent) { if (projBeforeEvent != null) { if (projEvent.equals(ProjectStateChangeEvent.STOPPED_APPLY_FAILED)) { - project.setStoppedStatus(buildBizStatus(projBeforeEvent).getCode()); + project.setStoppedStatus(buildBizStatus(projEvent).getCode()); } else { Wrapper changeHistoryWrapper = Wrappers.lambdaQuery(ProjectChangeHistory.class) .eq(ProjectChangeHistory::getProjectCode, project.getProjectCode()) @@ -158,7 +158,7 @@ public class ProjectChangeStopHelper { .createOn(project.getCreateOn()) .build()); project.setStatus(change.getBeforeStatus()); - project.setStage(project.getStatus() - project.getStatus() % 10000); + project.setStage(ProjectStatus.getNoNull(project.getStatus()).getStage().getCode()); projectService.updateById(project); List purchases = purchaseService.listByProjectId(project.getId()); if (!purchases.isEmpty()) {