@@ -203,7 +203,7 @@ public class ConstructionPlanManage { | |||||
VUtils.isTrue(StringUtils.isBlank(projectDto.getConstructionPlanFile())).throwMessage("提交失败 请提交建设方案!"); | VUtils.isTrue(StringUtils.isBlank(projectDto.getConstructionPlanFile())).throwMessage("提交失败 请提交建设方案!"); | ||||
//直接先到待方案审批 | //直接先到待方案审批 | ||||
Project project = projectLibManage.saveProjectWithVersionAndStatus(projectDto,null, | Project project = projectLibManage.saveProjectWithVersionAndStatus(projectDto,null, | ||||
ProjectStatusEnum.PLAN_TO_BE_DECLARED.getCode()); | |||||
ProjectStatusEnum.PLAN_TO_BE_DECLARED.getCode(),Boolean.TRUE); | |||||
dto.getProjectInfo().setId(project.getId()); | dto.getProjectInfo().setId(project.getId()); | ||||
dto.setRestart(Boolean.TRUE); | dto.setRestart(Boolean.TRUE); | ||||
return startTheProcess(dto); | return startTheProcess(dto); | ||||
@@ -162,7 +162,7 @@ public class PrequalificationDeclaredProjectManage { | |||||
VUtils.isTrue(Objects.isNull(projectInfo)).throwMessage("提交失败 此项目不存在!"); | VUtils.isTrue(Objects.isNull(projectInfo)).throwMessage("提交失败 此项目不存在!"); | ||||
//重新提交 生成新版本号 回到 待预审状态 | //重新提交 生成新版本号 回到 待预审状态 | ||||
Project project = projectLibManage.saveProjectWithVersionAndStatus(projectDto,null, | Project project = projectLibManage.saveProjectWithVersionAndStatus(projectDto,null, | ||||
ProjectStatusEnum.PENDING_PREQUALIFICATION.getCode()); | |||||
ProjectStatusEnum.PENDING_PREQUALIFICATION.getCode(),Boolean.FALSE); | |||||
dto.getProjectInfo().setId(project.getId()); | dto.getProjectInfo().setId(project.getId()); | ||||
dto.setRestart(Boolean.TRUE); | dto.setRestart(Boolean.TRUE); | ||||
return startTheProcess(dto); | return startTheProcess(dto); | ||||
@@ -96,7 +96,7 @@ public class ReviewByProvincialDeptManage { | |||||
// 对接省级联审的接口 | // 对接省级联审的接口 | ||||
Project p = projectLibManage.saveProjectWithVersionAndStatus(project,null, | Project p = projectLibManage.saveProjectWithVersionAndStatus(project,null, | ||||
ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode()); | |||||
ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode(),Boolean.FALSE); | |||||
List<ProjectApplication> applications = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class) | List<ProjectApplication> applications = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class) | ||||
.eq(ProjectApplication::getProjectId, p.getId())); | .eq(ProjectApplication::getProjectId, p.getId())); | ||||
@@ -451,7 +451,7 @@ public class ProjectLibManage { | |||||
return project; | return project; | ||||
} | } | ||||
public Project saveProjectWithVersionAndStatus(ProjectDTO projecDto,Integer stageCode,Integer statusCode){ | |||||
public Project saveProjectWithVersionAndStatus(ProjectDTO projecDto,Integer stageCode,Integer statusCode,Boolean isConstruct){ | |||||
Project oldProject = projectService.getById(projecDto.getId()); | Project oldProject = projectService.getById(projecDto.getId()); | ||||
Project project = new Project(); | Project project = new Project(); | ||||
VUtils.isTrue(Objects.isNull(oldProject)) | VUtils.isTrue(Objects.isNull(oldProject)) | ||||
@@ -496,7 +496,7 @@ public class ProjectLibManage { | |||||
app.setProjectId(project.getId()); | app.setProjectId(project.getId()); | ||||
app.setBuildOrgName(project.getBuildOrgName()); | app.setBuildOrgName(project.getBuildOrgName()); | ||||
app.setBuildOrgCode(project.getBuildOrgCode()); | app.setBuildOrgCode(project.getBuildOrgCode()); | ||||
app.setIsConstruct(Boolean.TRUE); | |||||
app.setIsConstruct(isConstruct); | |||||
return app; | return app; | ||||
}) | }) | ||||
.collect(Collectors.toList()); | .collect(Collectors.toList()); | ||||