From 0da3680602319b0c88fd37dc3d4d72e696d662c9 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 24 Nov 2022 15:49:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/RentContractInfoServiceImpl.java     | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 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 4288c99..ae78092 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
@@ -307,31 +307,30 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
                 user.setName(tenant.getName()); // 姓名
                 user.setMobile(tenant.getMobile()); // 手机
                 user.setIdCard(tenant.getIdCard()); // 证件号
-                user.setUnitId(contractDto.getUnitId()); // 工作单位
+
                 // 补充字段
                 // 与房主关系
-                if("子女".equals(tenant.getYfzgx())){
-                    user.setYhzgx("1000000000000000083");
+                if("本人".equals(tenant.getYfzgx())){
+                    user.setYhzgx("1");
+                }else if("配偶".equals(tenant.getYfzgx())){
+                    user.setYhzgx("2");
+                }else if("子女".equals(tenant.getYfzgx())){
+                    user.setYhzgx("3");
                 }else if ("父母".equals(tenant.getYfzgx())){
-                    user.setYhzgx("1000000000000000084");
+                    user.setYhzgx("4");
                 }else if ("岳父母或公婆".equals(tenant.getYfzgx())){
-                    user.setYhzgx("1000000000000000085");
-                }
-                else if ("祖父母".equals(tenant.getYfzgx())){
-                    user.setYhzgx("1000000000000000086");
-                }
-                else if ("媳婿".equals(tenant.getYfzgx())){
-                    user.setYhzgx("1000000000000000087");
-                }
-                else if ("孙子女".equals(tenant.getYfzgx())){
-                    user.setYhzgx("1000000000000000088");
-                }
-                else if ("兄弟姐妹".equals(tenant.getYfzgx())){
-                    user.setYhzgx("1000000000000000089");
-                }
-                else {
+                    user.setYhzgx("5");
+                }else if ("祖父母".equals(tenant.getYfzgx())){
+                    user.setYhzgx("6");
+                }else if ("媳婿".equals(tenant.getYfzgx())){
+                    user.setYhzgx("7");
+                }else if ("孙子女".equals(tenant.getYfzgx())){
+                    user.setYhzgx("8");
+                }else if ("兄弟姐妹".equals(tenant.getYfzgx())){
+                    user.setYhzgx("9");
+                }else {
                     // 【中介】存为【其他】
-                    user.setYhzgx("1000000000000000090");
+                    user.setYhzgx("10");
                 }
                 // 是否党员【是:1 否:0】
                 if("党员".equals(tenant.getPoliticalStatus())){
@@ -345,11 +344,16 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
                 }else{
                     user.setIsVeterans("0"); // 是否服过兵役
                 }
+                // 户籍所在地
+                user.setHjszd(tenant.getHjszd());
+                // 工作单位
+                user.setGzdw(tenant.getUnit());
 
                 user.setCustomerId(loginUserUtil.getLoginUserCustomerId());
                 user.setGridId(contractDto.getGridId());
                 user.setVillageId(contractDto.getVillageId());
                 user.setBuildId(contractDto.getBuildId());
+                user.setUnitId(contractDto.getUnitId());
                 user.setHomeId(contractDto.getHomeId());
                 user.setGender(IdCardNoValidatorUtils.getGender(tenant.getIdCard()));
                 user.setAgencyId(contractDto.getCommunityId());