From c2c5d71f85ac026f1f6a7b54d832be7805d37be8 Mon Sep 17 00:00:00 2001
From: WendyYang <realwendyyang@qq.com>
Date: Thu, 6 Jun 2024 17:06:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=9D=E5=AD=98=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E8=AE=B0=E5=BD=95=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=9C=80=E6=96=B0=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pm/api/projectlib/manage/ProjectLibManage.java | 41 +++++++++++-----------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java
index 5c20f10..658aad7 100644
--- a/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java
+++ b/hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java
@@ -915,28 +915,29 @@ public class ProjectLibManage {
      * 重新提交工作流时 舍弃在原有项目修改
      * 新增一个新的项目 新的版本号
      */
-    public Project newProjectWithVersion(ProjectDTO projectDto, Boolean isConstruct) {
-        Project oldProject = projectService.getNoNull(projectDto.getId());
-        Project project = new Project();
-        BeanUtil.copyProperties(oldProject, project, CopyOptions.create()
+    public Project newProjectWithVersion(ProjectDTO reqProj, Boolean isConstruct) {
+        Project oldProj = projectService.getNoNull(reqProj.getId());
+        Project newProj = new Project();
+        BeanUtil.copyProperties(oldProj, newProj, CopyOptions.create()
                 .setIgnoreError(Boolean.TRUE).setIgnoreNullValue(Boolean.TRUE));
-        BeanUtil.copyProperties(projectDto, project, CopyOptions.create()
+        BeanUtil.copyProperties(reqProj, newProj, CopyOptions.create()
                 .setIgnoreError(Boolean.TRUE).setIgnoreNullValue(Boolean.TRUE));
-        project.setVersion(oldProject.getVersion() + 1);
-        project.setId(null);
-        project.setCreateOn(LocalDateTime.now());
-        project.setUpdateOn(LocalDateTime.now());
-        project.setIsBackReject(Boolean.FALSE);
-        projectStateMachineUtil.pass(project);
-        projectService.save(project);
-
-        oldProject.setIsBackReject(Boolean.TRUE);
-        projectService.updateById(oldProject);
-        projectService.reverseNewest(project.getProjectCode(), project.getId());
-        saveApplication(projectDto, project, isConstruct);
-        savePaymentPlans(project, projectDto.getPaymentPlanList());
-        saveGovSystemReplaceInfos(project, projectDto.getSystemReplaceInfos());
-        return project;
+        newProj.setVersion(oldProj.getVersion() + 1);
+        newProj.setId(null);
+        newProj.setNewest(Boolean.TRUE);
+        newProj.setCreateOn(LocalDateTime.now());
+        newProj.setUpdateOn(LocalDateTime.now());
+        newProj.setIsBackReject(Boolean.FALSE);
+        projectStateMachineUtil.pass(newProj);
+        projectService.save(newProj);
+
+        oldProj.setIsBackReject(Boolean.TRUE);
+        projectService.updateById(oldProj);
+        projectService.reverseNewest(newProj.getProjectCode(), newProj.getId());
+        saveApplication(reqProj, newProj, isConstruct);
+        savePaymentPlans(newProj, reqProj.getPaymentPlanList());
+        saveGovSystemReplaceInfos(newProj, reqProj.getSystemReplaceInfos());
+        return newProj;
     }
 
     private void saveGovSystemReplaceInfos(Project project, List<GovSystemReplaceInfoDTO> govSystemReplaceInfos) {