@@ -584,7 +584,7 @@ public class MeetingManage { | |||||
} | } | ||||
result.getRandomRules().add(randomRule); | result.getRandomRules().add(randomRule); | ||||
}); | }); | ||||
AvoidRuleDTO avoidInfo = inviteAvoidRuleService.getAvoidInfoDto(meetingId); | |||||
AvoidRuleDTO avoidInfo = inviteAvoidRuleService.getAvoidInfo(meetingId); | |||||
AvoidInfoVO vo = new AvoidInfoVO(); | AvoidInfoVO vo = new AvoidInfoVO(); | ||||
vo.setWeekInviteCount(avoidInfo.getWeekInviteCount()); | vo.setWeekInviteCount(avoidInfo.getWeekInviteCount()); | ||||
vo.setAvoidOrgIds(avoidInfo.getAvoidOrgIdList()); | vo.setAvoidOrgIds(avoidInfo.getAvoidOrgIdList()); | ||||
@@ -20,9 +20,9 @@ public interface IExpertInviteAvoidRuleService extends IService<ExpertInviteAvoi | |||||
* 获取回避信息 | * 获取回避信息 | ||||
* | * | ||||
* @param meetingId 会议ID | * @param meetingId 会议ID | ||||
* @return com.ningdatech.emapi.meeting.entity.dto.AvoidInfoDto | |||||
* @return {@link AvoidRuleDTO} | |||||
* @author WendyYang | * @author WendyYang | ||||
**/ | **/ | ||||
AvoidRuleDTO getAvoidInfoDto(Long meetingId); | |||||
AvoidRuleDTO getAvoidInfo(Long meetingId); | |||||
} | } |
@@ -30,7 +30,7 @@ public class ExpertInviteAvoidRuleServiceImpl extends ServiceImpl<ExpertInviteAv | |||||
} | } | ||||
@Override | @Override | ||||
public AvoidRuleDTO getAvoidInfoDto(Long meetingId) { | |||||
public AvoidRuleDTO getAvoidInfo(Long meetingId) { | |||||
ExpertInviteAvoidRule avoidRule = getByMeetingId(meetingId); | ExpertInviteAvoidRule avoidRule = getByMeetingId(meetingId); | ||||
if (avoidRule == null) { | if (avoidRule == null) { | ||||
return null; | return null; | ||||
@@ -233,7 +233,7 @@ public class ExpertRandomInviteTask { | |||||
// 随机邀请规则 | // 随机邀请规则 | ||||
Map<Long, RandomInviteRuleDTO> ruleMap = inviteRuleService.randomRuleByMeetingId(meetingId); | Map<Long, RandomInviteRuleDTO> ruleMap = inviteRuleService.randomRuleByMeetingId(meetingId); | ||||
// 回避规则 | // 回避规则 | ||||
AvoidRuleDTO avoidRule = inviteAvoidRuleService.getAvoidInfoDto(meetingId); | |||||
AvoidRuleDTO avoidRule = inviteAvoidRuleService.getAvoidInfo(meetingId); | |||||
// 还需要抽取的规则数量 | // 还需要抽取的规则数量 | ||||
AtomicInteger notIgnoreCnt = new AtomicInteger(ruleMap.size()); | AtomicInteger notIgnoreCnt = new AtomicInteger(ruleMap.size()); | ||||
AtomicInteger notSupportCnt = new AtomicInteger(0); | AtomicInteger notSupportCnt = new AtomicInteger(0); | ||||