From 6aab3569c64c9ec2bcc0c694a39c6faeb77d7da6 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 6 Dec 2022 13:59:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/RentContractInfoServiceImpl.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
index 3f9f37d..8ce7373 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java
@@ -11,6 +11,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.IdCardNoValidatorUtils;
 import com.epmet.dto.*;
 import com.epmet.dto.form.IcHouseAddFormDTO;
 import com.epmet.dto.form.RentTenantFormDTO;
@@ -363,8 +364,13 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
                 user.setBuildId(contractDto.getBuildId());
                 user.setUnitId(contractDto.getUnitId());
                 user.setHomeId(contractDto.getHomeId());
-                user.setGender(tenant.getGender());
-                user.setBirthday(tenant.getBirthday());
+                user.setGender("0".equals(IdCardNoValidatorUtils.getGender(tenant.getIdCard())) ? "" : IdCardNoValidatorUtils.getGender(tenant.getIdCard()));
+                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.setAgencyId(contractDto.getCommunityId());
                 Result<CustomerAgencyDTO> agencyInfo = govOrgOpenFeignClient.getAgencyById(contractDto.getCommunityId());
@@ -377,9 +383,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
                 formDTO.setUser(user);
                 formDTO.setStartDate(contractDto.getStartDate()); // 合同开始时间
                 formDTO.setEndDate(contractDto.getEndDate()); // 合同结束时间
-                log.info("+++++++++++++++++++++++++++++++formDTO:" + formDTO.toString());
                 Result result = epmetUserOpenFeignClient.updateImage(formDTO);
-                log.info("+++++++++++++++++++++++++++++++同步居民信息:" + result.toString());
 
             });