modify:

1. 申报项目暂存报错修改；

hz-pm-api/src/main/java/com/hz/pm/api/projectdeclared/manage/DeclaredProjectManage.java

@@ -30,23 +30,18 @@ import com.hz.pm.api.projectdeclared.model.enumerization.ProjectDraftTypeEnum;
 import com.hz.pm.api.projectdeclared.model.vo.DeclaredProgressStatisticsVO;
 import com.hz.pm.api.projectdeclared.model.vo.ProjectDraftVO;
 import com.hz.pm.api.projectdeclared.service.IProjectDraftService;
-import com.hz.pm.api.projectdeclared.utils.ProjectIdCodeCacheUtil;
 import com.hz.pm.api.projectlib.helper.ProjectManageUtil;
 import com.hz.pm.api.projectlib.manage.ProjectLibManage;
 import com.hz.pm.api.projectlib.model.dto.GovSystemReplaceInfoDTO;
 import com.hz.pm.api.projectlib.model.dto.ProjectDTO;
 import com.hz.pm.api.projectlib.model.dto.ProjectPaymentPlanDTO;
-import com.hz.pm.api.projectlib.model.entity.MhProject;
 import com.hz.pm.api.projectlib.model.entity.Project;
 import com.hz.pm.api.projectlib.model.entity.ProjectApplication;
-import com.hz.pm.api.projectlib.model.entity.ProjectStatusChange;
 import com.hz.pm.api.projectlib.model.enumeration.ProjectTypeNewEnum;
 import com.hz.pm.api.projectlib.model.enumeration.status.ProjectStatus;
 import com.hz.pm.api.projectlib.model.req.ProjectListReq;
 import com.hz.pm.api.projectlib.model.vo.ProjectLibListItemVO;
-import com.hz.pm.api.projectlib.service.IMhProjectService;
 import com.hz.pm.api.projectlib.service.IProjectService;
-import com.hz.pm.api.projectlib.service.IProjectStatusChangeService;
 import com.hz.pm.api.staging.enums.MsgTypeEnum;
 import com.hz.pm.api.sys.manage.NoticeManage;
 import com.hz.pm.api.sys.manage.ProcessModelManage;
@@ -101,8 +96,6 @@ public class DeclaredProjectManage {
     private final NoticeManage noticeManage;
     private final UserInfoHelper userInfoHelper;
     private final MhUnitCache mhUnitCache;
-    private final IMhProjectService mhProjectService;
-    private final IProjectStatusChangeService projectStatusChangeService;
 
     /**
      * 新项目 启动实例
@@ -130,11 +123,6 @@ public class DeclaredProjectManage {
             reqProj.setSuperOrg(user.getMhUnitName());
         }
 
-        //如果是重新提交的话 判断下 项目是否存在
-        if (Objects.nonNull(reqProj.getId())) {
-            //新申报的项目不允许带项目id
-            reqProj.setId(null);
-        }
         projectLibManage.saveProjectNewVersion(reqProj, user.getUserId(), ProjectStatus.TO_BE_DECLARED);
     }
 

hz-pm-api/src/main/java/com/hz/pm/api/projectlib/manage/ProjectLibManage.java

@@ -947,11 +947,13 @@ public class ProjectLibManage {
                     throw ReturnException.wrap("项目状态异常，保存失败");
                 }
                 newProj.setVersion(oldProj.getVersion() + 1);
-                projectService.reverseNewest(reqProj.getProjectCode(), reqProj.getId());
             }
             newProj.setId(null);
             newProj.setNewest(Boolean.TRUE);
             if (projectService.save(newProj)) {
+                if (Objects.nonNull(reqProj.getId())) {
+                    projectService.reverseNewest(reqProj.getProjectCode(), newProj.getId());
+                }
                 projectSaveHelper.saveApplication(reqProj, newProj, null);
                 projectSaveHelper.savePaymentPlans(newProj, reqProj.getPaymentPlanList());
                 projectSaveHelper.saveGovSystemReplaceInfos(newProj.getId(), newProj.getProjectCode(), reqProj.getSystemReplaceInfos());