@@ -32,7 +32,7 @@ import java.util.Objects; | |||||
* @author CMM | * @author CMM | ||||
* @since 2023/02/27 10:09 | * @since 2023/02/27 10:09 | ||||
*/ | */ | ||||
@Order(3) | |||||
@Order(4) | |||||
@Component | @Component | ||||
public class PreliminaryPreviewHandle extends AbstractProcessBusinessHandle { | public class PreliminaryPreviewHandle extends AbstractProcessBusinessHandle { | ||||
@@ -42,7 +42,7 @@ public class PreliminaryPreviewHandle extends AbstractProcessBusinessHandle { | |||||
private final ProjectVersionUtil projectVersionUtil; | private final ProjectVersionUtil projectVersionUtil; | ||||
private final IProjectService projectService; | private final IProjectService projectService; | ||||
private Integer order = 3; | |||||
private Integer order = 4; | |||||
public PreliminaryPreviewHandle(IProjectInstService projectInstService, ProcessInstanceService processInstanceService, BuildUserUtils buildUserUtils, ProjectVersionUtil projectVersionUtil, IProjectService projectService) { | public PreliminaryPreviewHandle(IProjectInstService projectInstService, ProcessInstanceService processInstanceService, BuildUserUtils buildUserUtils, ProjectVersionUtil projectVersionUtil, IProjectService projectService) { | ||||
this.projectInstService = projectInstService; | this.projectInstService = projectInstService; | ||||
@@ -58,15 +58,15 @@ public class ProcessExecuteChainHandle { | |||||
for (AbstractProcessBusinessHandle processBusinessHandle : processBusinessHandles) { | for (AbstractProcessBusinessHandle processBusinessHandle : processBusinessHandles) { | ||||
if(Objects.nonNull(project) && RegionContant.LS_LQ_CODE.equals(project.getAreaCode())) { | if(Objects.nonNull(project) && RegionContant.LS_LQ_CODE.equals(project.getAreaCode())) { | ||||
if(processBusinessHandle instanceof AnnualPlanHandle){ | if(processBusinessHandle instanceof AnnualPlanHandle){ | ||||
processBusinessHandle.setOrder(6); | |||||
processBusinessHandle.setOrder(7); | |||||
}else if(processBusinessHandle instanceof ConstructionPlanReviewHandle){ | }else if(processBusinessHandle instanceof ConstructionPlanReviewHandle){ | ||||
processBusinessHandle.setOrder(5); | |||||
processBusinessHandle.setOrder(6); | |||||
} | } | ||||
}else{ | }else{ | ||||
if(processBusinessHandle instanceof AnnualPlanHandle){ | if(processBusinessHandle instanceof AnnualPlanHandle){ | ||||
processBusinessHandle.setOrder(5); | |||||
}else if(processBusinessHandle instanceof ConstructionPlanReviewHandle){ | |||||
processBusinessHandle.setOrder(6); | processBusinessHandle.setOrder(6); | ||||
}else if(processBusinessHandle instanceof ConstructionPlanReviewHandle){ | |||||
processBusinessHandle.setOrder(7); | |||||
} | } | ||||
} | } | ||||
@@ -21,13 +21,13 @@ import java.util.Objects; | |||||
* @author CMM | * @author CMM | ||||
* @since 2023/02/24 14:35 | * @since 2023/02/24 14:35 | ||||
*/ | */ | ||||
@Order(4) | |||||
@Order(3) | |||||
@Component | @Component | ||||
public class ProvinceUnitedReviewHandle extends AbstractProcessBusinessHandle { | public class ProvinceUnitedReviewHandle extends AbstractProcessBusinessHandle { | ||||
private final IProjectService projectService; | private final IProjectService projectService; | ||||
private final INdProjectStatusChangeService projectStatusChangeService; | private final INdProjectStatusChangeService projectStatusChangeService; | ||||
private Integer order = 4; | |||||
private Integer order = 3; | |||||
public ProvinceUnitedReviewHandle(IProjectService projectService, | public ProvinceUnitedReviewHandle(IProjectService projectService, | ||||
INdProjectStatusChangeService projectStatusChangeService){ | INdProjectStatusChangeService projectStatusChangeService){ | ||||