|
@ -11,6 +11,7 @@ import com.epmet.commons.tools.page.PageData; |
|
|
import com.epmet.commons.tools.security.user.LoginUserUtil; |
|
|
import com.epmet.commons.tools.security.user.LoginUserUtil; |
|
|
import com.epmet.commons.tools.utils.ConvertUtils; |
|
|
import com.epmet.commons.tools.utils.ConvertUtils; |
|
|
import com.epmet.commons.tools.utils.Result; |
|
|
import com.epmet.commons.tools.utils.Result; |
|
|
|
|
|
import com.epmet.commons.tools.validator.IdCardNoValidatorUtils; |
|
|
import com.epmet.dto.*; |
|
|
import com.epmet.dto.*; |
|
|
import com.epmet.dto.form.IcHouseAddFormDTO; |
|
|
import com.epmet.dto.form.IcHouseAddFormDTO; |
|
|
import com.epmet.dto.form.RentTenantFormDTO; |
|
|
import com.epmet.dto.form.RentTenantFormDTO; |
|
@ -363,8 +364,13 @@ 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(tenant.getGender()); |
|
|
user.setGender("0".equals(IdCardNoValidatorUtils.getGender(tenant.getIdCard())) ? "" : IdCardNoValidatorUtils.getGender(tenant.getIdCard())); |
|
|
user.setBirthday(tenant.getBirthday()); |
|
|
if(tenant.getIdCard() != null && tenant.getIdCard().length() == 18){ |
|
|
|
|
|
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()); |
|
|
Result<CustomerAgencyDTO> agencyInfo = govOrgOpenFeignClient.getAgencyById(contractDto.getCommunityId()); |
|
|
Result<CustomerAgencyDTO> agencyInfo = govOrgOpenFeignClient.getAgencyById(contractDto.getCommunityId()); |
|
@ -377,9 +383,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf |
|
|
formDTO.setUser(user); |
|
|
formDTO.setUser(user); |
|
|
formDTO.setStartDate(contractDto.getStartDate()); // 合同开始时间
|
|
|
formDTO.setStartDate(contractDto.getStartDate()); // 合同开始时间
|
|
|
formDTO.setEndDate(contractDto.getEndDate()); // 合同结束时间
|
|
|
formDTO.setEndDate(contractDto.getEndDate()); // 合同结束时间
|
|
|
log.info("+++++++++++++++++++++++++++++++formDTO:" + formDTO.toString()); |
|
|
|
|
|
Result result = epmetUserOpenFeignClient.updateImage(formDTO); |
|
|
Result result = epmetUserOpenFeignClient.updateImage(formDTO); |
|
|
log.info("+++++++++++++++++++++++++++++++同步居民信息:" + result.toString()); |
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|