From 99a320a0a13de6fb4b0982421f0e316bbbf5ce20 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Thu, 30 Mar 2023 13:43:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=8F=96=E4=B8=93=E5=AE=B6=E8=B5=8B?= =?UTF-8?q?=E5=80=BC=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/meeting/builder/ExpertInviteBuilder.java | 2 +- .../ningdatech/pmapi/meeting/manage/MeetingManage.java | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/builder/ExpertInviteBuilder.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/builder/ExpertInviteBuilder.java index 5f54ae3..546da59 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/builder/ExpertInviteBuilder.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/builder/ExpertInviteBuilder.java @@ -25,7 +25,7 @@ public class ExpertInviteBuilder { MeetingExpert expert = new MeetingExpert(); expert.setMeetingId(meetingId); expert.setMobile(user.getPhoneNo()); - expert.setExpertId(user.getId()); + expert.setExpertId(user.getUserId()); expert.setExpertName(user.getExpertName()); expert.setRuleId(ruleId); expert.setInviteType(type.getCode()); 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 b7f8d4a..dbcd6b0 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 @@ -414,16 +414,16 @@ public class MeetingManage { } List expertIds = CollUtils.fieldList(experts, MeetingExpert::getExpertId); Map expertMap = meetingManageHelper.getExpertBasicInfo(expertIds); - Function mapping = sme -> { - ExpertBasicInfoVO expert = expertMap.get(sme.getExpertId()); + Function mapping = me -> { + ExpertBasicInfoVO expert = expertMap.get(me.getExpertId()); 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("通知中"); } else { item.setNoticeStatus("已通知");