Merge remote-tracking branch 'origin/binlog' into binlog

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/modules/house/excel/HouseTenantExcel.java

New file
@@ -0,0 +1,86 @@
package org.springblade.modules.house.excel;

import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.alibaba.excel.annotation.write.style.ContentRowHeight;
import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import org.springblade.common.excel.ExcelDictConverter;
import org.springblade.common.excel.ExcelDictItem;
import org.springblade.common.excel.ExcelDictItemLabel;

import java.io.Serializable;

@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
public class HouseTenantExcel implements Serializable {

   private static final long serialVersionUID = 2L;


   /**
    * 门牌地址编码
    */
   @ColumnWidth(25)
   @ExcelProperty( "门牌地址编码*")
   private String houseCode;

   /** 姓名 */
   @ColumnWidth(15)
   @ExcelProperty( "姓名*")
   private String name;

   /** 性别 1: 男 0：女  2: 未知 */
   @ColumnWidth(15)
   @ExcelProperty( value = "性别",converter = ExcelDictConverter.class)
   @ExcelDictItemLabel(type = "sex")
   @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)
   @ExcelDictItemLabel(type = "nationType")
   @ExcelDictItem(type = "nationType")
   private String ethnicity;


   /** 户籍地址 */
   @ColumnWidth(15)
   @ExcelProperty( "户籍地址")
   private String hukouRegistration;


   /** 工作单位 */
   @ColumnWidth(15)
   @ExcelProperty( "工作单位")
   private String employer;


}