From 88a1e4b6825704f10d5c4207616fad1a5171656b Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 24 May 2024 11:19:47 +0800
Subject: [PATCH] 租客导入优化

---
 src/main/java/org/springblade/modules/house/excel/HouseTenantExcel.java |   82 +++++++++++++++++++++-------------------
 1 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/excel/HouseTenantExcel.java b/src/main/java/org/springblade/modules/house/excel/HouseTenantExcel.java
index 011d0fe..d2a2f6b 100644
--- a/src/main/java/org/springblade/modules/house/excel/HouseTenantExcel.java
+++ b/src/main/java/org/springblade/modules/house/excel/HouseTenantExcel.java
@@ -20,50 +20,18 @@
 
 	private static final long serialVersionUID = 2L;
 
+
 	/**
-	 * 出租屋ID
+	 * 门牌地址编码
 	 */
-	@ExcelProperty(value = "地址编码")
 	@ColumnWidth(25)
+	@ExcelProperty( "门牌地址编码*")
 	private String houseCode;
-	/**
-	 * 姓名
-	 */
-	@ExcelProperty(value = "姓名")
-	@ColumnWidth(25)
+
+	/** 姓名 */
+	@ColumnWidth(15)
+	@ExcelProperty( "姓名*")
 	private String name;
-	/**
-	 * 联系电话
-	 */
-	@ExcelProperty(value = "联系电话")
-	@ColumnWidth(25)
-	private String phone;
-	/**
-	 * 身份证
-	 */
-	@ExcelProperty(value = "身份证")
-	@ColumnWidth(25)
-	private String idCard;
-	/**
-	 * 户籍
-	 */
-	@ExcelProperty(value = "户籍")
-	@ColumnWidth(25)
-	private String domicile;
-	/**
-	 * 工作单位
-	 */
-	@ExcelProperty(value = "工作单位")
-	@ColumnWidth(25)
-	private String workUnit;
-
-	/**
-	 * 备注
-	 */
-	@ExcelProperty(value = "备注")
-	@ColumnWidth(25)
-	private String remark;
-
 
 	/** 性别 1: 男 0：女  2: 未知 */
 	@ColumnWidth(15)
@@ -72,6 +40,29 @@
 	@ExcelDictItem(type = "sex")
 	private String gender;
 
+
+	/** 手机号 */
+	@ColumnWidth(15)
+	@ExcelProperty( "手机号*")
+	private String phoneNumber;
+
+	/** 生日 */
+	@ColumnWidth(15)
+	@ExcelProperty( "生日")
+	private String birthday;
+
+	/** 身份证 */
+	@ColumnWidth(15)
+	@ExcelProperty( "身份证号码")
+	private String idCard;
+
+	/** 与业主关系 */
+	@ColumnWidth(15)
+	@ExcelProperty( value = "与业主关系*(业主/妻子/丈夫/女儿/儿子/母亲/父亲/.../租户/其他)",converter = ExcelDictConverter.class)
+	@ExcelDictItemLabel(type = "roleRelation")
+	@ExcelDictItem(type = "roleRelation")
+	private String relationship;
+
 	/** 民族 */
 	@ColumnWidth(15)
 	@ExcelProperty( value = "民族",converter = ExcelDictConverter.class)
@@ -79,4 +70,17 @@
 	@ExcelDictItem(type = "nationType")
 	private String ethnicity;
 
+
+	/** 户籍地址 */
+	@ColumnWidth(15)
+	@ExcelProperty( "户籍地址")
+	private String hukouRegistration;
+
+
+	/** 工作单位 */
+	@ColumnWidth(15)
+	@ExcelProperty( "工作单位")
+	private String employer;
+
+
 }

--
Gitblit v1.9.3