|
@ -360,6 +360,7 @@ public class VaccinationInfoServiceImpl extends BaseVimCurdServiceImpl<Vaccinati |
|
|
insertUserList = ConvertUtils.sourceToTarget(addList, VaccinationInfoEntity.class); |
|
|
insertUserList = ConvertUtils.sourceToTarget(addList, VaccinationInfoEntity.class); |
|
|
List<EpidemicUserInoutRecordEntity> finalAddressList = addressList; |
|
|
List<EpidemicUserInoutRecordEntity> finalAddressList = addressList; |
|
|
insertUserList.forEach(entity -> { |
|
|
insertUserList.forEach(entity -> { |
|
|
|
|
|
entity.setIdentityNo(entity.getIdentityNo().toUpperCase()); |
|
|
Optional<EpidemicUserInoutRecordEntity> addressOptional = finalAddressList.stream().filter(address -> address.getIdCard().equals(entity.getIdentityNo())).findFirst(); |
|
|
Optional<EpidemicUserInoutRecordEntity> addressOptional = finalAddressList.stream().filter(address -> address.getIdCard().equals(entity.getIdentityNo())).findFirst(); |
|
|
if (addressOptional.isPresent()) { |
|
|
if (addressOptional.isPresent()) { |
|
|
entity.setStreet(addressOptional.get().getLiveAddressName()); |
|
|
entity.setStreet(addressOptional.get().getLiveAddressName()); |
|
|