|
@ -303,6 +303,13 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf |
|
|
List<RentTenantInfoDTO> tenantList = rentTenantInfoService.list(tenantParams); |
|
|
List<RentTenantInfoDTO> tenantList = rentTenantInfoService.list(tenantParams); |
|
|
|
|
|
|
|
|
tenantList.forEach(tenant -> { |
|
|
tenantList.forEach(tenant -> { |
|
|
|
|
|
// 根据身份证解析性别和出生日期
|
|
|
|
|
|
tenant.setGender("0".equals(IdCardNoValidatorUtils.getGender(tenant.getIdCard())) ? "" : IdCardNoValidatorUtils.getGender(tenant.getIdCard())); |
|
|
|
|
|
if(tenant.getIdCard() != null && tenant.getIdCard().length() == 18){ |
|
|
|
|
|
tenant.setBirthday(tenant.getIdCard().substring(6, 10) + "-" + tenant.getIdCard().substring(10, 12) + "-" + tenant.getIdCard().substring(12, 14)); |
|
|
|
|
|
}else{ |
|
|
|
|
|
tenant.setBirthday(""); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// 1、审核通过,插入合同记录表的租客信息
|
|
|
// 1、审核通过,插入合同记录表的租客信息
|
|
|
RentTenantInfoEntity rentTenantInfoEntity = ConvertUtils.sourceToTarget(tenant, RentTenantInfoEntity.class); |
|
|
RentTenantInfoEntity rentTenantInfoEntity = ConvertUtils.sourceToTarget(tenant, RentTenantInfoEntity.class); |
|
@ -364,12 +371,8 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf |
|
|
user.setBuildId(contractDto.getBuildId()); |
|
|
user.setBuildId(contractDto.getBuildId()); |
|
|
user.setUnitId(contractDto.getUnitId()); |
|
|
user.setUnitId(contractDto.getUnitId()); |
|
|
user.setHomeId(contractDto.getHomeId()); |
|
|
user.setHomeId(contractDto.getHomeId()); |
|
|
user.setGender("0".equals(IdCardNoValidatorUtils.getGender(tenant.getIdCard())) ? "" : IdCardNoValidatorUtils.getGender(tenant.getIdCard())); |
|
|
user.setGender(tenant.getGender()); |
|
|
if(tenant.getIdCard() != null && tenant.getIdCard().length() == 18){ |
|
|
user.setBirthday(tenant.getBirthday()); |
|
|
user.setBirthday(tenant.getIdCard().substring(6, 10) + "-" + tenant.getIdCard().substring(10, 12) + "-" + tenant.getIdCard().substring(12, 14)); |
|
|
|
|
|
}else{ |
|
|
|
|
|
user.setBirthday(""); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
user.setMz(tenant.getMz()); |
|
|
user.setMz(tenant.getMz()); |
|
|
user.setAgencyId(contractDto.getCommunityId()); |
|
|
user.setAgencyId(contractDto.getCommunityId()); |
|
|