From a2e31c9db24b87ccf1dec6e6f78b38049be59b78 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Mon, 7 Aug 2023 16:17:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BC=9A=E8=AE=AE=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=85=AC=E5=B9=B3=E6=80=A7=E5=AE=A1=E6=9F=A5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/meeting/entity/enumeration/MeetingReviewTypeEnum.java | 4 +++- .../main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/enumeration/MeetingReviewTypeEnum.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/enumeration/MeetingReviewTypeEnum.java index c0a1d04..3d8df0c 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/enumeration/MeetingReviewTypeEnum.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/enumeration/MeetingReviewTypeEnum.java @@ -26,7 +26,9 @@ public enum MeetingReviewTypeEnum { ACCEPTANCE_SCHEME_REVIEW("验收方案评审", "3"), - DEPT_JOIN_REVIEW("部门联审", "4"); + DEPT_JOIN_REVIEW("部门联审", "4"), + + FAIRNESS_REVIEW( "公平性审查","5"); private final String value; private final String code; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java index 0db4f93..50ca331 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java @@ -851,7 +851,8 @@ public class MeetingManage { public PageVo optionProject(MeetingOptionProjectReq req) { String meetingType = req.getMeetingType(); - LambdaQueryWrapper query = Wrappers.lambdaQuery(Project.class); + LambdaQueryWrapper query = Wrappers.lambdaQuery(Project.class) + .eq(Project::getNewest, Boolean.TRUE); switch (MeetingReviewTypeEnum.getByCode(meetingType)) { case PRELIMINARY_SCHEME_REVIEW: buildOptionProjectQuery(query, meetingType, ProjectStatusEnum.PRE_APPLYING); @@ -865,6 +866,8 @@ public class MeetingManage { case DEPT_JOIN_REVIEW: buildOptionProjectQuery(query, meetingType, ProjectStatusEnum.DEPARTMENT_JOINT_REVIEW); break; + case FAIRNESS_REVIEW: + break; default: return PageVo.empty(); }