From aa29b494d44807c893b6059fdb22cd462ce42d35 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Fri, 21 Jul 2023 16:52:05 +0800
Subject: [PATCH] =?UTF-8?q?debug=20=E6=98=AF=E5=90=A6=E6=98=AF=20=E4=B8=8A?=
 =?UTF-8?q?=E7=BA=A7=E6=9D=A1=E7=BA=BF=E4=B8=BB=E7=AE=A1=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=20=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/projectdeclared/manage/ConstructionPlanManage.java          | 2 +-
 .../projectdeclared/manage/PrequalificationDeclaredProjectManage.java | 2 +-
 .../pmapi/projectdeclared/manage/ReviewByProvincialDeptManage.java    | 2 +-
 .../java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionPlanManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionPlanManage.java
index 545811c..296cfb4 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionPlanManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ConstructionPlanManage.java
@@ -203,7 +203,7 @@ public class ConstructionPlanManage {
         VUtils.isTrue(StringUtils.isBlank(projectDto.getConstructionPlanFile())).throwMessage("提交失败 请提交建设方案!");
         //直接先到待方案审批
         Project project = projectLibManage.saveProjectWithVersionAndStatus(projectDto,null,
-                ProjectStatusEnum.PLAN_TO_BE_DECLARED.getCode());
+                ProjectStatusEnum.PLAN_TO_BE_DECLARED.getCode(),Boolean.TRUE);
         dto.getProjectInfo().setId(project.getId());
         dto.setRestart(Boolean.TRUE);
         return startTheProcess(dto);
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/PrequalificationDeclaredProjectManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/PrequalificationDeclaredProjectManage.java
index 686c92e..f0697fa 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/PrequalificationDeclaredProjectManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/PrequalificationDeclaredProjectManage.java
@@ -162,7 +162,7 @@ public class PrequalificationDeclaredProjectManage {
         VUtils.isTrue(Objects.isNull(projectInfo)).throwMessage("提交失败 此项目不存在!");
         //重新提交 生成新版本号 回到 待预审状态
         Project project = projectLibManage.saveProjectWithVersionAndStatus(projectDto,null,
-                ProjectStatusEnum.PENDING_PREQUALIFICATION.getCode());
+                ProjectStatusEnum.PENDING_PREQUALIFICATION.getCode(),Boolean.FALSE);
         dto.getProjectInfo().setId(project.getId());
         dto.setRestart(Boolean.TRUE);
         return startTheProcess(dto);
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 b7f0271..2896eda 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
@@ -96,7 +96,7 @@ public class ReviewByProvincialDeptManage {
 
         // 对接省级联审的接口
         Project p = projectLibManage.saveProjectWithVersionAndStatus(project,null,
-                ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode());
+                ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode(),Boolean.FALSE);
 
         List<ProjectApplication> applications = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class)
                 .eq(ProjectApplication::getProjectId, 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 aa3679a..f28f78f 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
@@ -451,7 +451,7 @@ public class ProjectLibManage {
         return project;
     }
 
-    public Project saveProjectWithVersionAndStatus(ProjectDTO projecDto,Integer stageCode,Integer statusCode){
+    public Project saveProjectWithVersionAndStatus(ProjectDTO projecDto,Integer stageCode,Integer statusCode,Boolean isConstruct){
         Project oldProject = projectService.getById(projecDto.getId());
         Project project = new Project();
         VUtils.isTrue(Objects.isNull(oldProject))
@@ -496,7 +496,7 @@ public class ProjectLibManage {
                             app.setProjectId(project.getId());
                             app.setBuildOrgName(project.getBuildOrgName());
                             app.setBuildOrgCode(project.getBuildOrgCode());
-                            app.setIsConstruct(Boolean.TRUE);
+                            app.setIsConstruct(isConstruct);
                             return app;
                         })
                         .collect(Collectors.toList());