From dde6d5b0936a8324e420c05d3110b5b0c191cb44 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Wed, 15 Feb 2023 14:14:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B0=83=E6=95=B4=20?= =?UTF-8?q?=E8=87=AA=E6=B5=8B=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/ProjectAdjustmentManage.java | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) 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 ac602d1..a36f1d2 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 @@ -57,6 +57,19 @@ public class ProjectAdjustmentManage { //项目名称去重 defaultDeclaredProjectManage.checkDuplication(projectDto); + //修改项目内容 + if(!modifyProject(projectDto)){ + throw new BusinessException("调整项目失败!"); + } + + //最后去重新 提交项目流程 不同的状态 提交到不同的工作流去 + Function declaredFunction = + reStartProcessMapUtil.reStartProcessMap.get(projectInfo.getStatus()); + VUtils.isTrue(Objects.isNull(declaredFunction)).throwMessage("状态不正常 没有找到对应申报函数!"); + return declaredFunction.apply(dto); + } + + private Boolean modifyProject(ProjectDTO projectDto) { //先修改项目信息 Project project = new Project(); BeanUtils.copyProperties(projectDto,project); @@ -78,11 +91,6 @@ public class ProjectAdjustmentManage { }).collect(Collectors.toList()); projectApplicationService.saveBatch(applications); } - - //最后去重新 提交项目流程 不同的状态 提交到不同的工作流去 - Function declaredFunction = - reStartProcessMapUtil.reStartProcessMap.get(projectInfo.getStatus()); - VUtils.isTrue(Objects.isNull(declaredFunction)).throwMessage("状态不正常 没有找到对应申报函数!"); - return declaredFunction.apply(dto); + return Boolean.TRUE; } }