获取项目初步方案详情

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}")

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;
         }