From ffd9075fa11cddc492d493954b663e34decd905e Mon Sep 17 00:00:00 2001 From: WendyYang Date: Thu, 30 Mar 2023 13:57:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E9=A1=B9=E7=9B=AE=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 dbcd6b0..10996f9 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 @@ -741,10 +741,10 @@ public class MeetingManage { buildOptionProjectQuery(query, meetingType, ProjectStatusEnum.SCHEME_UNDER_REVIEW); break; case ACCEPTANCE_SCHEME_REVIEW: - query.eq(Project::getStatus, ProjectStatusEnum.FINAL_ACCEPTANCE_IS_UNDER_REVIEW); + buildOptionProjectQuery(query, meetingType, ProjectStatusEnum.FINAL_ACCEPTANCE_IS_UNDER_REVIEW); break; case DEPT_JOIN_REVIEW: - query.eq(Project::getStatus, ProjectStatusEnum.DEPARTMENT_JOINT_REVIEW); + buildOptionProjectQuery(query, meetingType, ProjectStatusEnum.DEPARTMENT_JOINT_REVIEW); break; default: return PageVo.empty(); From 030295edf2c803a7c04abce6a539c72c2f298c91 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Thu, 30 Mar 2023 14:16:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ningdatech/pmapi/meeting/entity/dto/MeetingBasicDTO.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/MeetingBasicDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/MeetingBasicDTO.java index ad48603..95389e9 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/MeetingBasicDTO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/dto/MeetingBasicDTO.java @@ -39,6 +39,11 @@ public class MeetingBasicDTO { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime startTime; + @NotNull(message = "结束时间不能为空") + @ApiModelProperty("结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endTime; + @NotNull(message = "评审耗时不能为空") @ApiModelProperty("评审耗时：1 半天、2 一天") private Integer meetingUsageTime;