From 9cc50d2e2c3fcfff3c6b95c09806d3881a97c5ff Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 15:20:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/excel/HouseAndHoldExcel.java |  114 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 104 insertions(+), 10 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 cd233c2..4b5f006 100644
--- a/src/main/java/org/springblade/modules/house/excel/HouseAndHoldExcel.java
+++ b/src/main/java/org/springblade/modules/house/excel/HouseAndHoldExcel.java
@@ -6,10 +6,12 @@
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springblade.common.excel.ExcelDictConverter;
 import org.springblade.common.excel.ExcelDictItem;
 import org.springblade.common.excel.ExcelDictItemLabel;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -79,8 +81,8 @@
 
 	/** 服务到期 */
 	@ExcelProperty( "服务到期")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	private Date serviceDue;
+//	@JsonFormat(pattern = "yyyy-MM-dd")
+	private String serviceDue;
 
 	/** 备注 */
 	@ExcelProperty( "备注")
@@ -173,11 +175,62 @@
 	@ExcelProperty( value = "学历",converter = ExcelDictConverter.class)
 	@ExcelDictItemLabel(type = "educationType")
 	private String education;
-
-	/** 户籍登记地 */
+	/**
+	 * 户籍类型 业务字典：residentType
+	 */
 	@ColumnWidth(15)
-	@ExcelProperty( "户籍登记地")
+	@ExcelProperty( value = "户籍类型",converter = ExcelDictConverter.class)
+	@ExcelDictItemLabel(type = "residentType")
+	private String residentType;
+	/**
+	 * 户籍省份
+	 */
+	@ColumnWidth(15)
+	@ExcelProperty( "户籍省份")
+	private String residentProvinceAdcode;
+	/**
+	 * 户籍城市
+	 */
+	@ColumnWidth(15)
+	@ExcelProperty( "户籍城市")
+	private String residentCityAdcode;
+	/**
+	 * 户籍地行政区划（需通过名称转换）
+	 */
+	@ColumnWidth(15)
+	@ExcelProperty( "户籍区县")
+	private String residentAdcode;
+	/**
+	 * 户籍登记地（户籍地址）
+	 */
+	@ColumnWidth(15)
+	@ExcelProperty( "户籍地址")
 	private String hukouRegistration;
+	/**
+	 * 籍贯地行政区划（需通过名称转换）
+	 */
+	@ColumnWidth(15)
+	@ExcelProperty( "籍贯地区县")
+	private String nativePlaceAdcode;
+	/**
+	 * 健康状况    业务字典 healthStatus
+	 */
+	@ColumnWidth(15)
+	@ExcelProperty( value = "健康状况",converter = ExcelDictConverter.class)
+	@ExcelDictItemLabel(type = "healthStatus")
+	private String healthStatus;
+	/**
+	 * 疾病名称
+	 */
+	@ColumnWidth(15)
+	@ExcelProperty( "疾病名称")
+	private String diseaseName;
+	/**
+	 * 宗教信仰
+	 */
+	@ColumnWidth(15)
+	@ExcelProperty( "宗教信仰")
+	private String religiousBelief;
 
 	/** 工作状态 */
 	@ColumnWidth(15)
@@ -189,6 +242,41 @@
 	@ColumnWidth(15)
 	@ExcelProperty( "工作单位")
 	private String employer;
+	/**
+	 * 职业类别
+	 */
+	@ColumnWidth(15)
+	@ExcelProperty( "职业类别")
+	private String occupation;
+	/**
+	 * 就职单位地址
+	 */
+	@ExcelProperty( "就职单位地址")
+	private String cmpyRegAddr;
+	/**
+	 * 外出原因
+	 */
+	@ColumnWidth(15)
+	@ExcelProperty( "外出原因")
+	private String goOutReason;
+	/**
+	 * 外出时间
+	 */
+	@ColumnWidth(15)
+	@ExcelProperty( "外出时间")
+//	@JsonFormat(pattern = "yyyy-MM-dd")
+	private String goOutTime;
+	/**
+	 * 外出去向
+	 */
+	@ColumnWidth(15)
+	@ExcelProperty( "外出去向")
+	private String goOutWhere;
+	/**
+	 * 外出详址
+	 */
+	@ExcelProperty( "外出详址")
+	private String goOutAddr;
 
 	/** 婚姻状态 */
 	@ColumnWidth(15)
@@ -205,11 +293,17 @@
 	@ColumnWidth(15)
 	@ExcelProperty( "其他联系方式")
 	private String otherContact;
-//
-//	/** 现居住地址 */
-//	@ColumnWidth(15)
-//	@ExcelProperty( "现居住地址")
-//	private String currentAddress;
+	/**
+	 * 居住地街道
+	 */
+	@ApiModelProperty(value = "居住地街道")
+	private String homeAdcode;
+
+	/**
+	 * 现居住地址
+	 */
+	@ExcelProperty( "居住地址")
+	private String currentAddress;
 
 	/** 残疾证 */
 	@ColumnWidth(15)

--
Gitblit v1.9.3