From 3f54b5827ca396ff6c843808698f3d1e7d973a80 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 17 Nov 2023 18:02:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/house/excel/HouseRentalExcel.java |   77 ++++++++++++++++++--------------------
 1 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/excel/HouseRentalExcel.java b/src/main/java/org/springblade/modules/house/excel/HouseRentalExcel.java
index 6a19822..1467d87 100644
--- a/src/main/java/org/springblade/modules/house/excel/HouseRentalExcel.java
+++ b/src/main/java/org/springblade/modules/house/excel/HouseRentalExcel.java
@@ -6,6 +6,8 @@
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springblade.common.excel.ExcelDictConverter;
+import org.springblade.common.excel.ExcelDictItem;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -23,68 +25,61 @@
 
 	private static final long serialVersionUID = 2L;
 
-	/** 主键ID */
-	@ExcelProperty( "主键ID")
-	private Long id;
-
-	/** 门牌地址编码 */
-	@ExcelProperty( "门牌地址编码")
-	private String houseCode;
+	/** 房屋 */
+	@ExcelProperty( "房屋")
+	@ColumnWidth(25)
+	private String address;
 
 	/** 租客关系 1: 同一户  2：不同一户 */
-	@ExcelProperty( "租客关系 1: 同一户  2：不同一户")
-	private Integer tenantRelationship;
+	@ColumnWidth(15)
+	@ExcelProperty( value = "租客关系",converter = ExcelDictConverter.class)
+	@ExcelDictItem(type = "partyEmberType")
+	private String tenantRelationship;
 
 	/** 租房时间 */
 	@ExcelProperty( "租房时间")
+	@ColumnWidth(15)
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date rentalTime;
 
 	/** 到期时间 */
 	@ExcelProperty( "到期时间")
+	@ColumnWidth(15)
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date dueTime;
 
-	/** 终止时间 */
-	@ExcelProperty( "终止时间")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	private Date terminationTime;
+//	/** 终止时间 */
+//	@ExcelProperty( "终止时间")
+//	@ColumnWidth(15)
+//	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//	private Date terminationTime;
 
 	/** 房屋状态 1：部分出租 2：全部出租 */
-	@ExcelProperty( "房屋状态 1：部分出租 2：全部出租")
-	private Integer houseStatus;
+	@ColumnWidth(15)
+	@ExcelProperty( value = "房屋状态",converter = ExcelDictConverter.class)
+	@ExcelDictItem(type = "houseStatusType")
+	private String houseStatus;
 
 	/** 租房用途 1：仓库 2：办公 3：商用  4：居住 */
-	@ExcelProperty( "租房用途 1：仓库 2：办公 3：商用  4：居住")
-	private Integer rentalUse;
+	@ColumnWidth(15)
+	@ExcelProperty( value = "租房用途",converter = ExcelDictConverter.class)
+	@ExcelDictItem(type = "rentalUseType")
+	private String rentalUse;
 
-	/** 审核状态 0: 待审核 1: 审核通过 2: 审核不通过 10未到期； 20即将到期 ；30 已到期 */
-	@ExcelProperty( "审核状态 0: 待审核 1: 审核通过 2: 审核不通过 10未到期； 20即将到期 ；30 已到期")
-	private Integer auditStatus;
+	/** 审核状态 0: 待确认 1: 已确认  */
+	@ColumnWidth(15)
+	@ExcelProperty( value = "审核状态",converter = ExcelDictConverter.class)
+	@ExcelDictItem(type = "confirmStatus")
+	private String auditStatus;
 
-	/** 合同附件URL */
-	@ExcelProperty( "合同附件URL")
-	private String fileUrls;
-
-	/** 创建人 */
-	@ExcelProperty( "创建人")
-	private Long createUser;
-
-	/** 创建时间 */
-	@ExcelProperty( "创建时间")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	private Date createTime;
-
-	/** 更新人 */
-	@ExcelProperty( "更新人")
-	private Long updateUser;
-
-	/** 更新时间 */
-	@ExcelProperty( "更新时间")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	private Date updateTime;
+	/** 租赁期限  */
+	@ColumnWidth(15)
+	@ExcelProperty( value = "租赁期限",converter = ExcelDictConverter.class)
+	@ExcelDictItem(type = "dldType")
+	private String dldType;
 
 	/** 备注 */
+	@ColumnWidth(15)
 	@ExcelProperty( "备注")
 	private String remark;
 

--
Gitblit v1.9.3