|
|
@@ -31,8 +31,8 @@ import com.hz.pm.api.meeting.entity.enumeration.MeetingStatusEnum; |
|
|
|
import com.hz.pm.api.meeting.entity.req.*; |
|
|
|
import com.hz.pm.api.meeting.entity.vo.*; |
|
|
|
import com.hz.pm.api.meeting.helper.ExpertInviteHelper; |
|
|
|
import com.hz.pm.api.meeting.helper.MeetingNotifyHelper; |
|
|
|
import com.hz.pm.api.meeting.helper.MeetingManageHelper; |
|
|
|
import com.hz.pm.api.meeting.helper.MeetingNotifyHelper; |
|
|
|
import com.hz.pm.api.meeting.service.*; |
|
|
|
import com.hz.pm.api.meeting.task.ExpertRandomInviteTask; |
|
|
|
import com.hz.pm.api.meta.helper.DictionaryCache; |
|
|
@@ -832,6 +832,7 @@ public class MeetingManage { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public void confirmedRoster(ConfirmedRosterReq req) { |
|
|
|
Long meetingId = req.getMeetingId(); |
|
|
|
String key = "MEETING_RESEND_SMS:" + meetingId; |
|
|
@@ -844,11 +845,11 @@ public class MeetingManage { |
|
|
|
throw BizException.wrap("请刷新后重试!"); |
|
|
|
} |
|
|
|
List<MeetingExpert> experts = meetingExpertService.listAgreedExperts(meetingId); |
|
|
|
if (!meeting.getConfirmedRoster()) { |
|
|
|
if (Boolean.FALSE.equals(meeting.getConfirmedRoster())) { |
|
|
|
// 首次确认的 |
|
|
|
LambdaUpdateWrapper<Meeting> update = Wrappers.lambdaUpdate(Meeting.class); |
|
|
|
update.set(Meeting::getConfirmedRoster, Boolean.TRUE); |
|
|
|
update.eq(Meeting::getId, meetingId); |
|
|
|
Wrapper<Meeting> update = Wrappers.lambdaUpdate(Meeting.class) |
|
|
|
.set(Meeting::getConfirmedRoster, Boolean.TRUE) |
|
|
|
.eq(Meeting::getId, meetingId); |
|
|
|
meetingService.update(update); |
|
|
|
// 将已确认专家名单的当前会议信息和专家数据同步到信创 |
|
|
|
MeetingExpertInfoVO data = getMeetingExpertInfoVO(meeting, experts); |
|
|
@@ -861,7 +862,7 @@ public class MeetingManage { |
|
|
|
return; |
|
|
|
} |
|
|
|
List<Long> currConfirmedMeIds = CollUtils.fieldList(expertNoticing, MeetingExpert::getId); |
|
|
|
LambdaUpdateWrapper<MeetingExpert> meUpdate = Wrappers.lambdaUpdate(MeetingExpert.class) |
|
|
|
Wrapper<MeetingExpert> meUpdate = Wrappers.lambdaUpdate(MeetingExpert.class) |
|
|
|
.in(MeetingExpert::getId, currConfirmedMeIds) |
|
|
|
.set(MeetingExpert::getConfirmedRoster, Boolean.TRUE); |
|
|
|
meetingExpertService.update(meUpdate); |
|
|
@@ -889,7 +890,7 @@ public class MeetingManage { |
|
|
|
List<Long> userIdList = new ArrayList<>(userIds); |
|
|
|
List<ExpertUserFullInfo> expertUserFullInfos = expertUserFullInfoService.listByUserIds(userIdList); |
|
|
|
Map<Long, ExpertUserFullInfo> userFullInfoMap = MapUtil.newHashMap(); |
|
|
|
if(CollUtil.isNotEmpty(expertUserFullInfos)){ |
|
|
|
if (CollUtil.isNotEmpty(expertUserFullInfos)) { |
|
|
|
userFullInfoMap = expertUserFullInfos.stream().collect(Collectors.toMap(ExpertUserFullInfo::getUserId, v -> v)); |
|
|
|
} |
|
|
|
Map<Long, ExpertUserFullInfo> finalUserFullInfoMap = userFullInfoMap; |
|
|
|