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; 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();