From cfc1de17c75b4f34f9096d1669d033bf160f0c2b Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 13 Jul 2023 12:02:09 +0800
Subject: [PATCH] =?UTF-8?q?debug=20=E6=9F=A5=E8=AF=A2=E6=9C=80=E6=96=B0?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/common/statemachine/action/ProjectDeclareChoiceAction.java   | 2 ++
 .../pmapi/projectlib/service/impl/ProjectApplicationServiceImpl.java   | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareChoiceAction.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareChoiceAction.java
index f46f9b4..c09b520 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareChoiceAction.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareChoiceAction.java
@@ -53,11 +53,13 @@ public class ProjectDeclareChoiceAction implements Action<ProjectStatusEnum, Pro
         log.info("立项批复之后，项目的状态为:{}" + project.getStatus());
         // 判断 是否有初次创建的应用
         if (CollUtil.isEmpty(projectApplications)){
+            project.setStage(ProjectStatusEnum.PROJECT_APPROVED.getCode());
             project.setStatus(ProjectStatusEnum.TO_BE_PURCHASED.getCode());
         }
         projectApplications.stream().forEach(app -> {
             Integer isFirst = app.getIsFirst();
             if(isFirst.equals(CommonEnum.YES.getCode())){
+                project.setStage(ProjectStatusEnum.NOT_APPROVED.getCode());
                 project.setStatus(ProjectStatusEnum.TO_BE_APP_REGISTER.getCode());
                 return;
             }
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/service/impl/ProjectApplicationServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/service/impl/ProjectApplicationServiceImpl.java
index b80f148..4f17811 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/service/impl/ProjectApplicationServiceImpl.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/service/impl/ProjectApplicationServiceImpl.java
@@ -23,9 +23,8 @@ public class ProjectApplicationServiceImpl extends ServiceImpl<ProjectApplicatio
 
     @Override
     public List<ProjectApplication> getApplicationsByProject(Project project) {
-        Long projectId = project.getId();
         List<ProjectApplication> apps = this.list(Wrappers.lambdaQuery(ProjectApplication.class)
-                .eq(ProjectApplication::getProjectId, projectId));
+                .eq(ProjectApplication::getProjectCode, project.getProjectCode()));
         return apps;
     }
 }