From 1614c18bc2b9f69d5575e9f9c5fc0092404015ea Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Thu, 13 Jul 2023 18:27:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E8=AE=BE=E6=96=B9=E6=A1=88=E7=94=B3?= =?UTF-8?q?=E6=8A=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectdeclared/manage/ConstructionPlanManage.java | 14 +++++++++----- 1 file changed, 9 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 507000a..f1b75ac 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 @@ -96,6 +96,13 @@ public class ConstructionPlanManage { .throwMessage("获取登录用户失败!"); ProjectDTO projectInfo = dto.getProjectInfo(); + Long projectInfoId = projectInfo.getId(); + Project oldProject = projectService.getById(projectInfoId); + + // 判断 项目当前状态 是不是 方案待申报 + VUtils.isTrue(!ProjectStatusEnum.PLAN_TO_BE_DECLARED.getCode().equals(oldProject.getStatus()) || + !ProjectStatusEnum.NOT_APPROVED.getCode().equals(oldProject.getStage())) + .throwMessage("提交失败 该项目不是 方案待申报状态或者未立项阶段"); if(StringUtils.isNotBlank(user.getRegionCode())){ projectInfo.setAreaCode(user.getRegionCode()); @@ -124,6 +131,8 @@ public class ConstructionPlanManage { Project constructProject = new Project(); BeanUtils.copyProperties(projectInfo,constructProject); + constructProject.setStatus(oldProject.getStatus()); + constructProject.setStage(oldProject.getStage()); String regionCode = user.getRegionCode(); @@ -147,11 +156,6 @@ public class ConstructionPlanManage { return "因为建设方案流程被禁用了 直接跳过!"; } - // 判断 项目当前状态 是不是 方案待申报 - VUtils.isTrue(!ProjectStatusEnum.PLAN_TO_BE_DECLARED.getCode().equals(constructProject.getStatus()) || - !ProjectStatusEnum.NOT_APPROVED.getCode().equals(constructProject.getStage())) - .throwMessage("提交失败 该项目不是 方案待申报状态或者未立项阶段"); - ProcessStartParamsVo params = new ProcessStartParamsVo(); params.setUser(declaredProjectManage.buildUser(employeeCode)); params.setProcessUsers(Collections.emptyMap());