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 3ffd01d..c0a1d04 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 @@ -42,4 +42,12 @@ public enum MeetingReviewTypeEnum { .orElseThrow(() -> new IllegalArgumentException("无效的会议评审类型编码")); } + public static String getValue(String code) { + return Arrays.stream(values()) + .filter(w -> w.getCode().equals(code)) + .map(MeetingReviewTypeEnum::getValue) + .findFirst() + .orElse("未知"); + } + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingByManagerVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingByManagerVO.java index c618011..5c6e43a 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingByManagerVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/MeetingByManagerVO.java @@ -64,4 +64,10 @@ public class MeetingByManagerVO { @ApiModelProperty("创建时间") private LocalDateTime createOn; + @ApiModelProperty("联系人") + private String connecter; + + @ApiModelProperty("联系方式") + private String contact; + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/helper/MeetingManageHelper.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/helper/MeetingManageHelper.java index 9e296b1..4d91b30 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/helper/MeetingManageHelper.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/helper/MeetingManageHelper.java @@ -25,6 +25,7 @@ import com.ningdatech.pmapi.meeting.entity.dto.MeetingBasicDTO; import com.ningdatech.pmapi.meeting.entity.dto.RandomInviteRuleDTO; import com.ningdatech.pmapi.meeting.entity.enumeration.ExpertAttendStatusEnum; import com.ningdatech.pmapi.meeting.entity.enumeration.ExpertInviteTypeEnum; +import com.ningdatech.pmapi.meeting.entity.enumeration.MeetingReviewTypeEnum; import com.ningdatech.pmapi.meeting.entity.req.MeetingListReq; import com.ningdatech.pmapi.meeting.entity.vo.ExpertBasicInfoVO; import com.ningdatech.pmapi.meeting.entity.vo.MeetingByManagerVO; @@ -99,23 +100,11 @@ public class MeetingManageHelper { return Boolean.FALSE; } - /** - * 获取专家出席会议的状态 - * - * @param info 会议状态及评价信息 - * @return java.lang.Integer - * @author WendyYang - **/ - public Integer getExpertAttendStatus(MeetingAndAttendStatusDTO info) { - // TODO - return null; - } - public MeetingByManagerVO buildByMeeting(Meeting meeting) { - DictionaryDTO dict = dictionaryCache.getByCode(meeting.getType()); return MeetingByManagerVO.builder() .meetingId(meeting.getId()) - .meetingTypeName(dict == null ? "" : dict.getName()) + .meetingType(meeting.getType()) + .meetingTypeName(MeetingReviewTypeEnum.getValue(meeting.getType())) .meetingName(meeting.getName()) .startTime(meeting.getStartTime()) .endTime(meeting.getEndTime()) @@ -124,6 +113,8 @@ public class MeetingManageHelper { .inviteStatus(meeting.getInviteStatus()) .status(meeting.getStatus()) .createOn(meeting.getCreateOn()) + .connecter(meeting.getConnecter()) + .contact(meeting.getContact()) .build(); }