|
@@ -170,12 +170,22 @@ public class ExaminationBasicServiceImpl extends BaseServiceImpl<Long, Examinati
|
|
|
}
|
|
|
Set<Integer> tenantIds = endExams.stream().map(e->Integer.valueOf(e.getTenantId())).collect(Collectors.toSet());
|
|
|
List<TenantInfo> tenants = tenantInfoDao.getTenants(new ArrayList<>(tenantIds));
|
|
|
+ List<String> phones = tenants.stream().map(TenantInfo::getContactPhone).collect(Collectors.toList());
|
|
|
Map<Integer, TenantInfo> idTenantMap = tenants.stream().collect(Collectors.toMap(TenantInfo::getId, e -> e));
|
|
|
+ List<SysUser> tenantUsers = sysUserDao.getWithPones(phones);
|
|
|
+ Map<String, SysUser> phoneUserMap = tenantUsers.stream().collect(Collectors.toMap(SysUser::getPhone, t -> t));
|
|
|
|
|
|
for (ExaminationBasic endExam : endExams) {
|
|
|
TenantInfo tenantInfo = idTenantMap.get(Integer.valueOf(endExam.getTenantId()));
|
|
|
+ if(Objects.isNull(tenantInfo)){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ SysUser sysUser = phoneUserMap.get(tenantInfo.getContactPhone());
|
|
|
+ if(Objects.isNull(sysUser)){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
Map<Integer, String> userPhoneMap = new HashMap<>();
|
|
|
- userPhoneMap.put(tenantInfo.getId(), tenantInfo.getContactPhone());
|
|
|
+ userPhoneMap.put(sysUser.getId(), sysUser.getPhone());
|
|
|
|
|
|
sysMessageService.batchSendMessage(MessageTypeEnum.EXAM_END_REMIND,
|
|
|
userPhoneMap, null, 0, null, YimeiSmsPlugin.PLUGIN_NAME,
|