From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001 From: linwe <872216996@qq.com> Date: Fri, 09 Aug 2024 14:29:18 +0800 Subject: [PATCH] 短信指定楼栋发送 --- src/main/java/org/springblade/modules/house/excel/HouseAndHoldExcel.java | 189 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 155 insertions(+), 34 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..72da2be 100644 --- a/src/main/java/org/springblade/modules/house/excel/HouseAndHoldExcel.java +++ b/src/main/java/org/springblade/modules/house/excel/HouseAndHoldExcel.java @@ -1,14 +1,17 @@ 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; 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; @@ -28,8 +31,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( "详细地址") @@ -66,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( "备注") @@ -83,12 +98,6 @@ @ExcelProperty( "手机号") private String phoneNumber; - /** 角色 */ - @ColumnWidth(15) - @ExcelProperty( value = "角色",converter = ExcelDictConverter.class) - @ExcelDictItemLabel(type = "roleType") - private String roleType; - /** 与角色关系（业主，父子，其他） */ @ColumnWidth(15) @ExcelProperty( value = "与角色关系",converter = ExcelDictConverter.class) @@ -103,14 +112,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) @@ -133,11 +163,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) @@ -149,6 +230,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) @@ -161,32 +277,37 @@ @ExcelProperty( "车牌号") private String cardNumber; -// /** 其他联系方式 */ -// @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 otherContact; + /** + * 居住地街道 + */ + @ApiModelProperty(value = "居住地街道") + private String homeAdcode; + + /** + * 现居住地址 + */ + @ExcelProperty( "居住地址") + private String currentAddress; + + /** 残疾证 */ + @ColumnWidth(15) + @ExcelProperty( "残疾证") + private String disabilityCert; /** 备注 */ @ColumnWidth(15) @ExcelProperty( "备注") private String remarks; + /** 备注 */ + @ColumnWidth(15) + @ExcelProperty( "重点人群") + private String labelId; + } -- Gitblit v1.9.3