|
@ -250,8 +250,16 @@ public class ChangeWelfareServiceImpl extends BaseServiceImpl<ChangeWelfareDao, |
|
|
// 获取居民信息
|
|
|
// 获取居民信息
|
|
|
CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); |
|
|
CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); |
|
|
List<IcResiUserDTO> userList = icResiUserDao.getImportUserList(tokenDto.getCustomerId(),staffInfoCache.getAgencyId()); |
|
|
List<IcResiUserDTO> userList = icResiUserDao.getImportUserList(tokenDto.getCustomerId(),staffInfoCache.getAgencyId()); |
|
|
// 获取证件号List
|
|
|
// 获取证件号List(排除X的大小写区分)
|
|
|
List<String> idCardList = userList.stream().map(IcResiUserDTO::getIdCard).collect(Collectors.toList()); |
|
|
// List<String> idCardList = userList.stream().map(IcResiUserDTO::getIdCard).collect(Collectors.toList());
|
|
|
|
|
|
List<String> idCardList = new ArrayList<>(); |
|
|
|
|
|
for(IcResiUserDTO icResiUserDTO : userList){ |
|
|
|
|
|
idCardList.add(icResiUserDTO.getIdCard()); |
|
|
|
|
|
if(icResiUserDTO.getIdCard().indexOf("X") >= 0){ |
|
|
|
|
|
idCardList.add(icResiUserDTO.getIdCard().replace("X","x")); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 获取已存在福利人员
|
|
|
// 获取已存在福利人员
|
|
|
List<String> welfareList = baseDao.getAllWelfareIdCard(tokenDto.getCustomerId()); |
|
|
List<String> welfareList = baseDao.getAllWelfareIdCard(tokenDto.getCustomerId()); |
|
|