diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java index 726d292..5ea60b7 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java @@ -149,7 +149,6 @@ public class AnnualPlanLibManage { Project oldProject = projectService.getById(req.getProjectId()); Project project = BeanUtil.copyProperties(oldProject, Project.class); // 被撤回重新申报的项目,项目ID要置空 - project.setId(null); project.setCreateOn(LocalDateTime.now()); project.setUpdateOn(LocalDateTime.now()); stateMachine.pass(project); @@ -167,6 +166,7 @@ public class AnnualPlanLibManage { project.setProjectCode(oldProject.getProjectCode()); project.setVersion(oldProject.getVersion() + 1); project.setInstCode(TodoCenterConstant.Declared.NULL_INST_CODE); + project.setId(null); if(projectService.save(project)){ applicationService.saveApplication(project,oldProject,Boolean.TRUE); // 将旧的项目版本置为不是最新