建设方案详情修改

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java

@@ -211,7 +211,12 @@ public class ProjectLibManage {
      */
     public Project saveConstructProjectInDeclared(ProjectDTO projectDto, String instanceId,
                                                   String employeeCode, Project oldProject) {
-        // 将旧的项目状态置为,版本置为不是最新
+
+        Project project = saveConstructProjectNewVersion(projectDto,instanceId,employeeCode,oldProject);
+        Long newProjectId = project.getId();
+
+        // 将旧的项目状态、阶段置为null,版本置为不是最新,项目编号设置为新的项目编号
+        oldProject.setProjectCode(project.getProjectCode());
         oldProject.setNewest(Boolean.FALSE);
         projectService.updateById(oldProject);
 
@@ -220,9 +225,7 @@ public class ProjectLibManage {
                 .set(Project::getStatus,null)
                 .eq(Project::getId,oldProject.getId());
         projectService.update(updateWrapper);
-
-        Project project = saveConstructProjectNewVersion(projectDto,instanceId,employeeCode,oldProject);
-        Long newProjectId = project.getId();
+        
         // 关联旧的项目的审核实例到新的项目ID
         List<Long> allVersionProjectIds = projectService.getAllVersionProjectId(project);
         List<ProjectInst> projectInstList = projectInstService.list(Wrappers.lambdaQuery(ProjectInst.class)