Browse Source

Merge remote-tracking branch 'origin/master'

master
PoffyZhang 1 year ago
parent
commit
656fa03ae3
2 changed files with 12 additions and 0 deletions
  1. +9
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingDetailBasicVO.java
  2. +3
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java

+ 9
- 0
pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingDetailBasicVO.java View File

@@ -83,4 +83,13 @@ public class MeetingDetailBasicVO {
@ApiModelProperty("评审项目信息")
private List<MeetingReviewProjectDTO> projects;

@ApiModelProperty("是否已停止邀请")
private Boolean invitedStopped;

@ApiModelProperty("是否已确认名单")
private Boolean confirmedRoster;

@ApiModelProperty("邀请类型")
private Integer inviteType;

}

+ 3
- 0
pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java View File

@@ -373,6 +373,9 @@ public class MeetingManage {
.createOn(meeting.getCreateOn())
.creator(meeting.getCreator())
.createBy(meeting.getCreator())
.inviteType(meeting.getInviteType())
.confirmedRoster(meeting.getConfirmedRoster())
.invitedStopped(meeting.getInviteStatus())
.build();
if (meeting.getIsInnerProject()) {
List<MeetingInnerProject> innerProjects = meetingInnerProjectService.listByMeetingId(meetingId);


Loading…
Cancel
Save