|
@@ -414,16 +414,16 @@ public class MeetingManage { |
|
|
} |
|
|
} |
|
|
List<Long> expertIds = CollUtils.fieldList(experts, MeetingExpert::getExpertId); |
|
|
List<Long> expertIds = CollUtils.fieldList(experts, MeetingExpert::getExpertId); |
|
|
Map<Long, ExpertBasicInfoVO> expertMap = meetingManageHelper.getExpertBasicInfo(expertIds); |
|
|
Map<Long, ExpertBasicInfoVO> expertMap = meetingManageHelper.getExpertBasicInfo(expertIds); |
|
|
Function<MeetingExpert, InviteExpertListItemVO> mapping = sme -> { |
|
|
|
|
|
ExpertBasicInfoVO expert = expertMap.get(sme.getExpertId()); |
|
|
|
|
|
|
|
|
Function<MeetingExpert, InviteExpertListItemVO> mapping = me -> { |
|
|
|
|
|
ExpertBasicInfoVO expert = expertMap.get(me.getExpertId()); |
|
|
InviteExpertListItemVO item = BeanUtil.copyProperties(expert, InviteExpertListItemVO.class); |
|
|
InviteExpertListItemVO item = BeanUtil.copyProperties(expert, InviteExpertListItemVO.class); |
|
|
item.setExpertMeetingId(sme.getId()); |
|
|
|
|
|
item.setMeetingId(sme.getMeetingId()); |
|
|
|
|
|
item.setStatus(sme.getStatus()); |
|
|
|
|
|
item.setMobile(sme.getMobile()); |
|
|
|
|
|
item.setNoticeTime(sme.getCreateOn()); |
|
|
|
|
|
item.setRuleId(sme.getRuleId()); |
|
|
|
|
|
if (ExpertAttendStatusEnum.NOTICING.eq(sme.getStatus())) { |
|
|
|
|
|
|
|
|
item.setExpertMeetingId(me.getId()); |
|
|
|
|
|
item.setMeetingId(me.getMeetingId()); |
|
|
|
|
|
item.setStatus(me.getStatus()); |
|
|
|
|
|
item.setMobile(me.getMobile()); |
|
|
|
|
|
item.setNoticeTime(me.getCreateOn()); |
|
|
|
|
|
item.setRuleId(me.getRuleId()); |
|
|
|
|
|
if (ExpertAttendStatusEnum.NOTICING.eq(me.getStatus())) { |
|
|
item.setNoticeStatus("通知中"); |
|
|
item.setNoticeStatus("通知中"); |
|
|
} else { |
|
|
} else { |
|
|
item.setNoticeStatus("已通知"); |
|
|
item.setNoticeStatus("已通知"); |
|
|