From a979649f2153c2c127ef7c8d8eff9042d04f36f9 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 20 Apr 2023 17:54:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4=20?=
 =?UTF-8?q?=E7=9C=81=E7=BA=A7=E8=81=94=E5=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/projectdeclared/manage/ReviewByProvincialDeptManage.java     | 3 +--
 .../java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java  | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewByProvincialDeptManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewByProvincialDeptManage.java
index ba4cbed..6da8be5 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewByProvincialDeptManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewByProvincialDeptManage.java
@@ -102,7 +102,7 @@ public class ReviewByProvincialDeptManage {
             throw new BusinessException("提交省级部门联审失败");
         }
         Project p = projectLibManage.saveProjectWithVersionAndStatus(project,null,
-                ProjectStatusEnum.PENDING_PREQUALIFICATION.getCode());
+                ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode());
 
         //入库暂存表 后续处理 对接外部接口
         projectInfo.setUpdateOn(LocalDateTime.now());
@@ -110,7 +110,6 @@ public class ReviewByProvincialDeptManage {
         projectInfo.setPreStartUserId(p.getSponsor());
         //当前实例置为空
         projectInfo.setInstCode(TodoCenterContant.Declared.NULL_INST_CODE);
-        projectStagingService.addByProject(projectInfo,"省级部门联审-重新提交");
         declaringDTO.getProjectInfo().setId(p.getId());
         return String.valueOf(p.getId());
     }
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
index 75ce1a6..b4003e4 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
@@ -318,6 +318,7 @@ public class ProjectLibManage {
                 List<ProjectApplication> apps = applicationList.stream()
                         .map(a -> {
                             ProjectApplication app = BeanUtil.copyProperties(a,ProjectApplication.class);
+                            app.setId(null);
                             app.setProjectId(project.getId());
                             return app;
                         })