From e82f384320fe192c495a7f4dffa2b692ce4170b3 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Mon, 17 Jul 2023 11:23:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=9D=E6=AD=A5=E6=96=B9=E6=A1=88=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/projectlib/controller/ProjectLibController.java | 6 +++--- .../com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectLibController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectLibController.java index 4c62bc3..a97c459 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectLibController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/controller/ProjectLibController.java @@ -58,10 +58,10 @@ public class ProjectLibController { return projectLibManage.applicationList(req); } - @GetMapping("/construct/{id}") - @ApiOperation("获取项目建设方案详情") + @GetMapping("/prePlan/{id}") + @ApiOperation("获取项目初步方案详情") public ProjectDetailVO constructDetail (@PathVariable Long id){ - return projectLibManage.getConstructProjectDetail(id); + return projectLibManage.getPrePlanProjectDetail(id); } @GetMapping("/{id}") diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java index ac0e867..3ba7460 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java @@ -215,8 +215,7 @@ public class ProjectLibManage { Project project = saveConstructProjectNewVersion(projectDto,instanceId,employeeCode,oldProject); Long newProjectId = project.getId(); - // 将旧的项目状态、阶段置为null,版本置为不是最新,项目编号设置为新的项目编号 - oldProject.setProjectCode(project.getProjectCode()); + // 将旧的项目状态、阶段置为null,版本置为不是最新 oldProject.setNewest(Boolean.FALSE); projectService.updateById(oldProject); @@ -738,15 +737,15 @@ public class ProjectLibManage { } /** - * 获取建设方案申报项目详情 + * 获取项目初步方案详情 * @param projectId * @return com.ningdatech.pmapi.projectlib.model.vo.ProjectDetailVO * @author CMM * @since 2023/07/12 11:43 */ - public ProjectDetailVO getConstructProjectDetail(Long projectId) { + public ProjectDetailVO getPrePlanProjectDetail(Long projectId) { // 查询建设方案申报前最新的项目申报信息 - Project projectInfo = projectService.getNewConstructProject(projectId); + Project projectInfo = projectService.getById(projectId); if (Objects.isNull(projectInfo)) { return null; } From 35970518ef6091bd74a1c7f096ef2b8c98fce550 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Mon, 17 Jul 2023 11:37:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BB=BA=E8=AE=BE=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E7=94=B3=E6=8A=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/projectlib/handle/PreliminaryPreviewHandle.java | 2 +- .../pmapi/projectlib/manage/ProjectLibManage.java | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/PreliminaryPreviewHandle.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/PreliminaryPreviewHandle.java index 653ec4a..c4a1843 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/PreliminaryPreviewHandle.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/PreliminaryPreviewHandle.java @@ -67,7 +67,7 @@ public class PreliminaryPreviewHandle extends AbstractProcessBusinessHandle { .orderByDesc(ProjectInst::getCreatOn) .last("limit 1")); ProcessProgressVo instanceDetail = null; - // 未找到当前版本项目的预审审核流程且当前项目版本号大于1(是被驳回重新申报的项目) + // 未找到当前版本项目的预审审核流程且当前项目版本号大于1(是被驳回重新申报的项目或者建设方案申报的项目) if (Objects.isNull(projectInst)) { if (project.getVersion() > CommonConst.VERSION_ONE){ // 获取上个版本的信息 diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java index 3ba7460..10057d2 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java @@ -213,7 +213,6 @@ public class ProjectLibManage { String employeeCode, Project oldProject) { Project project = saveConstructProjectNewVersion(projectDto,instanceId,employeeCode,oldProject); - Long newProjectId = project.getId(); // 将旧的项目状态、阶段置为null,版本置为不是最新 oldProject.setNewest(Boolean.FALSE); @@ -224,17 +223,6 @@ public class ProjectLibManage { .set(Project::getStatus,null) .eq(Project::getId,oldProject.getId()); projectService.update(updateWrapper); - - // 关联旧的项目的审核实例到新的项目ID - List allVersionProjectIds = projectService.getAllVersionProjectId(project); - List projectInstList = projectInstService.list(Wrappers.lambdaQuery(ProjectInst.class) - .in(ProjectInst::getProjectId, allVersionProjectIds)) - .stream().map(p -> { - p.setProjectId(newProjectId); - return p; - }).collect(Collectors.toList()); - projectInstService.updateBatchById(projectInstList); - //保存项目和实例的关系 ProjectInst projectInst = new ProjectInst(); projectInst.setProjectId(project.getId()); @@ -332,7 +320,9 @@ public class ProjectLibManage { project.setStatus(ProjectStatusEnum.SCHEME_UNDER_REVIEW.getCode()); project.setInstCode(instanceId); project.setSponsor(employeeCode); + // 项目编号不变，版本号加1 project.setProjectCode(oldProject.getProjectCode()); + project.setVersion(oldProject.getVersion()); // 标记为建设方案申报 project.setIsConstruct(Boolean.TRUE); // 保存初步方案项目ID From cd39cdcef378910c31fd8778ba36641d4302db57 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Mon, 17 Jul 2023 11:53:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BB=BA=E8=AE=BE=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E7=94=B3=E6=8A=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java index 10057d2..cf59a0e 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java @@ -322,7 +322,7 @@ public class ProjectLibManage { project.setSponsor(employeeCode); // 项目编号不变，版本号加1 project.setProjectCode(oldProject.getProjectCode()); - project.setVersion(oldProject.getVersion()); + project.setVersion(oldProject.getVersion() + 1); // 标记为建设方案申报 project.setIsConstruct(Boolean.TRUE); // 保存初步方案项目ID