From 02706ba12c8c23867ae4917b01c55335c93e50f3 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Mon, 31 Jul 2023 16:13:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=96=BD=E7=AE=A1=E7=90=86=E4=B8=BB?=
 =?UTF-8?q?=E5=B9=B2=E9=80=80=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ningdatech/pmapi/projectdeclared/manage/OperationManage.java    | 6 ++++++
 .../com/ningdatech/pmapi/projectdeclared/manage/PurchaseManage.java | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/OperationManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/OperationManage.java
index ee0f200..518258a 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/OperationManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/OperationManage.java
@@ -8,6 +8,7 @@ import com.ningdatech.pmapi.projectdeclared.model.dto.OperationDTO;
 import com.ningdatech.pmapi.projectdeclared.model.entity.Operation;
 import com.ningdatech.pmapi.projectdeclared.model.vo.OperationVO;
 import com.ningdatech.pmapi.projectdeclared.service.IOperationService;
+import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
 import com.ningdatech.pmapi.projectlib.model.entity.Project;
 import com.ningdatech.pmapi.projectlib.service.IProjectService;
 import com.ningdatech.pmapi.user.security.auth.model.UserInfoDetails;
@@ -58,6 +59,11 @@ public class OperationManage {
         VUtils.isTrue(Objects.isNull(project))
                 .throwMessage("项目不存在!");
 
+        //首先要判断 项目当前状态 是不是 待开工状态
+        VUtils.isTrue(!ProjectStatusEnum.OPERATION.getCode().equals(project.getStatus()) ||
+                        !ProjectStatusEnum.PROJECT_APPROVED.getCode().equals(project.getStage()))
+                .throwMessage("提交失败 该项目不是 待开工或者已立项阶段");
+
         Operation old = operationService.getOne(Wrappers.lambdaQuery(Operation.class)
                 .eq(Operation::getProjectId, project.getProjectCode())
                 .last(BizConst.LIMIT_1));
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/PurchaseManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/PurchaseManage.java
index 98c7f11..7f71b70 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/PurchaseManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/PurchaseManage.java
@@ -74,7 +74,8 @@ public class PurchaseManage {
         VUtils.isTrue(Objects.isNull(user)).throwMessage("获取登录用户失败!");
         LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(req);
         //待采购状态
-        query.eq(Project::getStatus, ProjectStatusEnum.TO_BE_PURCHASED.getCode());
+        query.in(Project::getStatus, Lists.newArrayList(ProjectStatusEnum.TO_BE_PURCHASED.getCode(),
+                ProjectStatusEnum.OPERATION.getCode()));
         query.eq(Project::getStage, ProjectStatusEnum.PROJECT_APPROVED.getCode());
         query.eq(Project::getNewest, Boolean.TRUE);
         query.orderByAsc(Project::getApprovalDate);