From fe31b770cef181ab49a3725187fb65a0fd023a78 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Thu, 20 Apr 2023 16:05:14 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/projectlib/handle/UnitInnerAuditHandle.java | 2 +- .../pmapi/projectlib/utils/ProjectVersionUtil.java | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/UnitInnerAuditHandle.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/UnitInnerAuditHandle.java index 1057e4a..8b00ace 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/UnitInnerAuditHandle.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/handle/UnitInnerAuditHandle.java @@ -79,7 +79,7 @@ public class UnitInnerAuditHandle extends AbstractProcessBusinessHandle { instanceDetail = processInstanceService.getProgressInstanceDetail(null, instCode); } if (Objects.isNull(instanceDetail)){ - throw new BizException("未获取到历史版本的流程详情!"); + throw new BizException("未获取到单位内部审核流程详情!"); } String status = instanceDetail.getStatus(); if (ProcessStatusEnum.UNDER_REVIEW.getDesc().equals(status)){ diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/utils/ProjectVersionUtil.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/utils/ProjectVersionUtil.java index faa55cb..947e116 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/utils/ProjectVersionUtil.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/utils/ProjectVersionUtil.java @@ -11,6 +11,7 @@ import com.ningdatech.pmapi.projectlib.model.entity.ProjectInst; import com.ningdatech.pmapi.projectlib.service.IProjectInstService; import com.ningdatech.pmapi.projectlib.service.IProjectService; import com.wflow.workflow.bean.vo.ProcessProgressVo; +import com.wflow.workflow.enums.ProcessHandlerEnum; import com.wflow.workflow.service.ProcessInstanceService; import liquibase.pro.packaged.I; import lombok.RequiredArgsConstructor; @@ -70,13 +71,18 @@ public class ProjectVersionUtil { .eq(ProjectInst::getProjectId, preProject.getId()) .eq(ProjectInst::getInstType,instTypeEnum.getCode())); if (CollUtil.isNotEmpty(projectInstList)) { - // 获取最新一个对应审核类型的项目关联实例 - ProjectInst projectInst = projectInstList.get(projectInstList.size() - 1); - // 获取流程详情 - instanceDetail = processInstanceService.getProgressInstanceDetail(null, projectInst.getInstCode()); - if (Objects.nonNull(instanceDetail)){ - return instanceDetail; + List processProgressVoList = projectInstList.stream() + .map(p -> processInstanceService.getProgressInstanceDetail(null, p.getInstCode())) + .collect(Collectors.toList()); + // 筛选出上个版本该类型审核流程通过的流程详情 + List instanceDetailList = processProgressVoList.stream() + .filter(p -> ProcessHandlerEnum.PASS.name().equals(p.getResult())) + .collect(Collectors.toList()); + if (CollUtil.isEmpty(instanceDetailList)){ + return null; } + // 获取最后一个流程详情 + return instanceDetailList.get(instanceDetailList.size() - 1); } } return null; From 734cf891598bec9d7c78abd698ee8ef5fe52b5b6 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Thu, 20 Apr 2023 16:14:37 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BD=A0=E6=92=92=E5=B0=BC=E6=92=92?= =?UTF-8?q?=E5=B0=BC=E6=92=92=E5=B0=BC=E6=92=92=E6=92=92=E9=98=BF=E8=90=A8?= =?UTF-8?q?=20=E6=92=92=E6=92=92=E6=92=92=E9=98=BF=E8=90=A8=E9=A3=92?= =?UTF-8?q?=E9=A3=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/projectdeclared/manage/DeclaredProjectManage.java | 3 ++- .../pmapi/projectdeclared/manage/ProjectAdjustmentManage.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java index 19b4cf0..1290082 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java @@ -11,6 +11,7 @@ import com.ningdatech.basic.function.VUtils; import com.ningdatech.basic.model.PageVo; import com.ningdatech.basic.util.CollUtils; import com.ningdatech.basic.util.NdDateUtils; +import com.ningdatech.pmapi.common.constant.BizConst; import com.ningdatech.pmapi.common.constant.RegionConst; import com.ningdatech.pmapi.common.enumeration.CommonEnum; import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum; @@ -136,7 +137,7 @@ public class DeclaredProjectManage { WflowModels model = processModelService.getOne(Wrappers.lambdaQuery(WflowModels.class) .eq(WflowModels::getRegionCode, regionCode) .eq(WflowModels::getProcessType, ProjectProcessStageEnum.ORG_INTERNAL_APPROVAL_PROCESS.getCode()) - .last("limit 1")); + .last(BizConst.LIMIT_1)); if (Objects.isNull(model)) { log.error("此 【{}】区域找不到单位流程配置", regionCode); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ProjectAdjustmentManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ProjectAdjustmentManage.java index a8199e1..83e4034 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ProjectAdjustmentManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ProjectAdjustmentManage.java @@ -98,9 +98,9 @@ public class ProjectAdjustmentManage { } //修改项目内容 - if(!modifyProject(projectDto)){ - throw new BusinessException("调整项目失败!"); - } +// if(!modifyProject(projectDto)){ +// throw new BusinessException("调整项目失败!"); +// } //最后去重新 提交项目流程 不同的状态 提交到不同的工作流去 Function declaredFunction = From c599b077ceee0c01ac0d9250973393dc622f68d0 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Thu, 20 Apr 2023 16:48:37 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ningdatech/pmapi/projectlib/utils/ProjectVersionUtil.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/utils/ProjectVersionUtil.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/utils/ProjectVersionUtil.java index 947e116..8f96faf 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/utils/ProjectVersionUtil.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/utils/ProjectVersionUtil.java @@ -12,6 +12,7 @@ import com.ningdatech.pmapi.projectlib.service.IProjectInstService; import com.ningdatech.pmapi.projectlib.service.IProjectService; import com.wflow.workflow.bean.vo.ProcessProgressVo; import com.wflow.workflow.enums.ProcessHandlerEnum; +import com.wflow.workflow.enums.ProcessStatusEnum; import com.wflow.workflow.service.ProcessInstanceService; import liquibase.pro.packaged.I; import lombok.RequiredArgsConstructor; @@ -60,7 +61,8 @@ public class ProjectVersionUtil { if (projectList.size() < CommonConst.VERSION_SIZE){ throw new BizException("未发现该项目的历史版本!"); } - // 获取上个版本的项目 + + // 获取之前版本的项目 int index = projectList.size() - 1; ProcessProgressVo instanceDetail = null; while (index > 0){ @@ -76,10 +78,10 @@ public class ProjectVersionUtil { .collect(Collectors.toList()); // 筛选出上个版本该类型审核流程通过的流程详情 List instanceDetailList = processProgressVoList.stream() - .filter(p -> ProcessHandlerEnum.PASS.name().equals(p.getResult())) + .filter(p -> ProcessStatusEnum.APPROVED.getDesc().equals(p.getStatus())) .collect(Collectors.toList()); if (CollUtil.isEmpty(instanceDetailList)){ - return null; + continue; } // 获取最后一个流程详情 return instanceDetailList.get(instanceDetailList.size() - 1); From 1f810df013f293f23eb8616c4d0718c683156311 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Thu, 20 Apr 2023 17:34:11 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=9C=81=E7=BA=A7=E8=81=94=E5=AE=A1=20?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/ReviewByProvincialDeptManage.java | 21 ++++++++++++++++++--- .../pmapi/projectlib/manage/ProjectLibManage.java | 15 +++++++++++++++ 2 files changed, 33 insertions(+), 3 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 794fc73..ba4cbed 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 @@ -13,11 +13,15 @@ import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication; import com.ningdatech.pmapi.projectlib.service.IProjectApplicationService; import com.ningdatech.pmapi.projectlib.service.IProjectService; import com.ningdatech.pmapi.provincial.service.IJoinReviewProvincialBureauService; +import com.ningdatech.pmapi.staging.service.IProjectStagingService; +import com.ningdatech.pmapi.todocenter.constant.TodoCenterContant; import com.wflow.exception.BusinessException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; import java.util.List; import java.util.Objects; @@ -42,6 +46,8 @@ public class ReviewByProvincialDeptManage { private final ProjectLibManage projectLibManage; + private final IProjectStagingService projectStagingService; + /** * 省级部门联审 * @param project @@ -95,8 +101,17 @@ public class ReviewByProvincialDeptManage { ApplicationConverter.convertProject(projectInfo,applications,fileService))){ throw new BusinessException("提交省级部门联审失败"); } - projectInfo = projectLibManage.saveProjectWithVersionAndStatus(project,null, - ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode()); - return String.valueOf(projectInfo.getId()); + Project p = projectLibManage.saveProjectWithVersionAndStatus(project,null, + ProjectStatusEnum.PENDING_PREQUALIFICATION.getCode()); + + //入库暂存表 后续处理 对接外部接口 + projectInfo.setUpdateOn(LocalDateTime.now()); + //保存一下 当前的主管单位发起人 + 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 006964d..c2c8568 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 @@ -304,13 +304,28 @@ public class ProjectLibManage { if(Objects.nonNull(statusCode)){ project.setStatus(statusCode); } + if(projectService.save(project)){ projectService.update(Wrappers.lambdaUpdate(Project.class) .set(Project::getNewest,Boolean.FALSE) .ne(Project::getId,project.getId()) .eq(Project::getProjectCode,project.getProjectCode())); + + //继承它的app + List apps = projectApplicationService.list(Wrappers.lambdaQuery(ProjectApplication.class) + .eq(ProjectApplication::getProjectId, oldProject.getId())); + if(CollUtil.isNotEmpty(apps)){ + List newApps = apps.stream() + .map(a -> { + a.setProjectId(project.getId()); + return a; + }) + .collect(Collectors.toList()); + projectApplicationService.saveBatch(newApps); + } } + return project; } From fff6cbcd798c47da78d39cd23f0e991f9bb843ed Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Thu, 20 Apr 2023 17:46:59 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E7=9C=81=E7=BA=A7=E8=81=94=E5=AE=A1=20?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/projectlib/manage/ProjectLibManage.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 c2c8568..a3b833d 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 @@ -28,6 +28,7 @@ import com.ningdatech.pmapi.projectdeclared.utils.GenerateProjectCodeUtil; import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; import com.ningdatech.pmapi.projectlib.handle.ProcessExecuteChainHandle; import com.ningdatech.pmapi.projectlib.helper.ProjectHelper; +import com.ningdatech.pmapi.projectlib.model.dto.ProjectApplicationDTO; import com.ningdatech.pmapi.projectlib.model.dto.ProjectDTO; import com.ningdatech.pmapi.projectlib.model.entity.Project; import com.ningdatech.pmapi.projectlib.model.entity.ProjectApplication; @@ -312,20 +313,19 @@ public class ProjectLibManage { .eq(Project::getProjectCode,project.getProjectCode())); //继承它的app - List apps = projectApplicationService.list(Wrappers.lambdaQuery(ProjectApplication.class) - .eq(ProjectApplication::getProjectId, oldProject.getId())); - if(CollUtil.isNotEmpty(apps)){ - List newApps = apps.stream() + List applicationList = projecDto.getApplicationList(); + if(CollUtil.isNotEmpty(applicationList)){ + List apps = applicationList.stream() .map(a -> { - a.setProjectId(project.getId()); - return a; + ProjectApplication app = BeanUtil.copyProperties(a,ProjectApplication.class); + app.setProjectId(project.getId()); + return app; }) .collect(Collectors.toList()); - projectApplicationService.saveBatch(newApps); + projectApplicationService.saveBatch(apps); } } - return project; } From 6b57222fbdf0431f44b243bb6ed37c4486070b1e Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Thu, 20 Apr 2023 17:48:07 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=A4=87=E6=B3=A8=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a3b833d..75ce1a6 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 @@ -312,7 +312,7 @@ public class ProjectLibManage { .ne(Project::getId,project.getId()) .eq(Project::getProjectCode,project.getProjectCode())); - //继承它的app + //app List applicationList = projecDto.getApplicationList(); if(CollUtil.isNotEmpty(applicationList)){ List apps = applicationList.stream() 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 7/8] =?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 apps = applicationList.stream() .map(a -> { ProjectApplication app = BeanUtil.copyProperties(a,ProjectApplication.class); + app.setId(null); app.setProjectId(project.getId()); return app; }) From 88d1ec029b034d2fce8fded40e8f75c7ec605942 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Thu, 20 Apr 2023 17:58:09 +0800 Subject: [PATCH 8/8] =?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 --- .../manage/ReviewByProvincialDeptManage.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 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 6da8be5..5b64491 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 @@ -97,20 +97,23 @@ public class ReviewByProvincialDeptManage { // 对接省级联审的接口 List applications = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class) .eq(ProjectApplication::getProjectId, projectInfo.getId())); - if(!joinReviewProvincialBureauService.pushImportProject( - ApplicationConverter.convertProject(projectInfo,applications,fileService))){ - throw new BusinessException("提交省级部门联审失败"); - } + Project p = projectLibManage.saveProjectWithVersionAndStatus(project,null, ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode()); //入库暂存表 后续处理 对接外部接口 - projectInfo.setUpdateOn(LocalDateTime.now()); + p.setUpdateOn(LocalDateTime.now()); //保存一下 当前的主管单位发起人 - projectInfo.setPreStartUserId(p.getSponsor()); + p.setPreStartUserId(p.getSponsor()); //当前实例置为空 - projectInfo.setInstCode(TodoCenterContant.Declared.NULL_INST_CODE); + p.setInstCode(TodoCenterContant.Declared.NULL_INST_CODE); declaringDTO.getProjectInfo().setId(p.getId()); + projectService.updateById(p); + if(!joinReviewProvincialBureauService.pushImportProject( + ApplicationConverter.convertProject(p,applications,fileService))){ + throw new BusinessException("提交省级部门联审失败"); + } + return String.valueOf(p.getId()); } }