From 08b7c30d355de98392c2793b777b4a5d5aa3d805 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Fri, 14 Jun 2024 08:30:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E5=AE=A1=E7=B1=BB=E5=9E=8B=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=9C=80=E6=B1=82=E8=AE=BA=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pm/api/meeting/entity/enumeration/MeetingReviewTypeEnum.java | 4 +++- .../src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java | 8 +++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/enumeration/MeetingReviewTypeEnum.java b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/enumeration/MeetingReviewTypeEnum.java index db056be..b240a47 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/enumeration/MeetingReviewTypeEnum.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/entity/enumeration/MeetingReviewTypeEnum.java @@ -30,7 +30,9 @@ public enum MeetingReviewTypeEnum { FAIRNESS_REVIEW("公平性审查", "5"), - PROJECT_REVIEW("项目评审", "6"); + PROJECT_REVIEW("项目评审", "6"), + + REQUIREMENT_REVIEW("需求论证", "7"); private final String value; private final String code; diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java index 701293a..6f2a746 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/meeting/manage/MeetingManage.java @@ -931,20 +931,18 @@ public class MeetingManage { .eq(Project::getNewest, Boolean.TRUE); switch (MeetingReviewTypeEnum.getByCode(meetingType)) { case PRELIMINARY_SCHEME_REVIEW: - buildOptionProjectQuery(query, meetingType, null); - break; case CONSTRUCTION_SCHEME_REVIEW: + case DEPT_JOIN_REVIEW: + buildOptionProjectQuery(query, meetingType, null); buildOptionProjectQuery(query, meetingType, null); break; case ACCEPTANCE_SCHEME_REVIEW: buildOptionProjectQuery(query, meetingType, ProjectStatus.ON_FINALLY_INSPECTED); break; - case DEPT_JOIN_REVIEW: - buildOptionProjectQuery(query, meetingType, null); - break; case FAIRNESS_REVIEW: break; case PROJECT_REVIEW: + case REQUIREMENT_REVIEW: buildOptionProjectQuery(query, meetingType, ProjectStatus.WITHOUT_PROJECT_REVIEW); break; default: