From 61c001e3651c81084e3a8496b55d4d6500bbca31 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 21 Nov 2023 09:16:02 +0800
Subject: [PATCH] 场所导入，商铺导入修改

---
 src/main/java/org/springblade/modules/house/excel/HouseAndHoldExcel.java |   70 ++++++++++++++++++++++++++---------
 1 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/excel/HouseAndHoldExcel.java b/src/main/java/org/springblade/modules/house/excel/HouseAndHoldExcel.java
index 5e06756..1118e78 100644
--- a/src/main/java/org/springblade/modules/house/excel/HouseAndHoldExcel.java
+++ b/src/main/java/org/springblade/modules/house/excel/HouseAndHoldExcel.java
@@ -1,5 +1,6 @@
 package org.springblade.modules.house.excel;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -28,8 +29,20 @@
 	private static final long serialVersionUID = 2L;
 
 	/** 门牌地址编码 */
-	@ExcelProperty( "地址编码")
+	@ExcelProperty( "门牌地址编码")
 	private String houseCode;
+
+	/** 街道名称 */
+	@ExcelProperty( "街道名称")
+	private String streetName;
+
+	/** 社区名称 */
+	@ExcelProperty( "社区名称")
+	private String communityName;
+
+	/** 所属网格 */
+	@ExcelProperty( "所属网格")
+	private String gridName;
 
 	/** 房屋名称 */
 	@ExcelProperty( "详细地址")
@@ -78,6 +91,12 @@
 	@ExcelProperty( "姓名")
 	private String name;
 
+	/** 绑定用户--无用 */
+	@ColumnWidth(15)
+	@ExcelProperty( "绑定用户")
+	@ExcelIgnore
+	private String bingUser;
+
 	/** 手机号 */
 	@ColumnWidth(15)
 	@ExcelProperty( "手机号")
@@ -103,14 +122,35 @@
 
 	/** 居住状态 1: 是  0：否 */
 	@ColumnWidth(15)
-	@ExcelProperty( value = "居住状态",converter = ExcelDictConverter.class)
-	@ExcelDictItemLabel(type = "residentialStatusType")
+	@ExcelProperty( "居住状态")
+	@ExcelIgnore
 	private String residentialStatus;
+
+	/** 性别 */
+	@ColumnWidth(15)
+	@ExcelProperty( value = "性别",converter = ExcelDictConverter.class)
+	@ExcelDictItemLabel(type = "sex")
+	private String gender;
 
 	/** 身份证 */
 	@ColumnWidth(15)
 	@ExcelProperty( "身份证")
 	private String idCard;
+
+	/*-----------用户标签-----------*/
+//	/** 退役军人 */
+//	@ColumnWidth(15)
+//	@ExcelProperty( "退役军人")
+//	private String exServiceman;
+
+	/*-----------用户标签-----------*/
+
+
+	/** 是否党员  1：党员  2：群众 */
+	@ColumnWidth(15)
+	@ExcelProperty( value = "党员（是/否）",converter = ExcelDictConverter.class)
+	@ExcelDictItemLabel(type = "partyEmberType")
+	private String partyEmber;
 
 	/** 港澳台通行证 */
 	@ColumnWidth(15)
@@ -161,26 +201,20 @@
 	@ExcelProperty( "车牌号")
 	private String cardNumber;
 
-//	/** 其他联系方式 */
-//	@ColumnWidth(15)
-//	@ExcelProperty( "其他联系方式")
-//	private String otherContact;
+	/** 其他联系方式 */
+	@ColumnWidth(15)
+	@ExcelProperty( "其他联系方式")
+	private String otherContact;
 //
 //	/** 现居住地址 */
 //	@ColumnWidth(15)
 //	@ExcelProperty( "现居住地址")
 //	private String currentAddress;
-//
-//	/** 残疾证 */
-//	@ColumnWidth(15)
-//	@ExcelProperty( "残疾证")
-//	private String disabilityCert;
-//
-//	/** 是否党员  1：党员  2：群众 */
-//	@ColumnWidth(15)
-//	@ExcelProperty( value = "是否党员",converter = ExcelDictConverter.class)
-//	@ExcelDictItemLabel(type = "partyEmberType")
-//	private Integer partyEmber;
+
+	/** 残疾证 */
+	@ColumnWidth(15)
+	@ExcelProperty( "残疾证")
+	private String disabilityCert;
 
 	/** 备注 */
 	@ColumnWidth(15)

--
Gitblit v1.9.3