|
@@ -1,9 +1,6 @@
|
|
package com.iden.common.vo;
|
|
package com.iden.common.vo;
|
|
|
|
|
|
|
|
|
|
-import com.alibaba.excel.annotation.ExcelProperty;
|
|
|
|
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
|
|
|
|
-import com.alibaba.excel.converters.url.UrlImageConverter;
|
|
|
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
|
import io.swagger.annotations.ApiModel;
|
|
import io.swagger.annotations.ApiModel;
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
@@ -11,7 +8,6 @@ import lombok.Data;
|
|
|
|
|
|
|
|
|
|
import java.io.Serializable;
|
|
import java.io.Serializable;
|
|
-import java.net.URL;
|
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -32,7 +28,6 @@ public class PersonVO implements Serializable {
|
|
private String uid;
|
|
private String uid;
|
|
|
|
|
|
@ApiModelProperty("人员编码(人员ID)")
|
|
@ApiModelProperty("人员编码(人员ID)")
|
|
- @ExcelProperty("人员编码")
|
|
|
|
private String code;
|
|
private String code;
|
|
|
|
|
|
@ApiModelProperty("人脸特征码")
|
|
@ApiModelProperty("人脸特征码")
|
|
@@ -40,38 +35,30 @@ public class PersonVO implements Serializable {
|
|
|
|
|
|
|
|
|
|
@ApiModelProperty("姓名")
|
|
@ApiModelProperty("姓名")
|
|
- @ExcelProperty("姓名")
|
|
|
|
private String name;
|
|
private String name;
|
|
|
|
|
|
|
|
|
|
@ApiModelProperty("图像")
|
|
@ApiModelProperty("图像")
|
|
private String image;
|
|
private String image;
|
|
|
|
|
|
- @ExcelProperty(value = "图像",converter = UrlImageConverter.class)
|
|
|
|
- @ColumnWidth(60)
|
|
|
|
- private URL imageUrl;
|
|
|
|
|
|
|
|
@ApiModelProperty("性别:M:男 W:女")
|
|
@ApiModelProperty("性别:M:男 W:女")
|
|
private String gender;
|
|
private String gender;
|
|
|
|
|
|
@ApiModelProperty("性别")
|
|
@ApiModelProperty("性别")
|
|
- @ExcelProperty("性别")
|
|
|
|
private String genderName;
|
|
private String genderName;
|
|
|
|
|
|
@ApiModelProperty("证件类型:1:身份证 2:护照 3 军官证")
|
|
@ApiModelProperty("证件类型:1:身份证 2:护照 3 军官证")
|
|
private String credentialsType;
|
|
private String credentialsType;
|
|
|
|
|
|
@ApiModelProperty("证件类型")
|
|
@ApiModelProperty("证件类型")
|
|
- @ExcelProperty("证件类型")
|
|
|
|
private String credentialsTypeName;
|
|
private String credentialsTypeName;
|
|
|
|
|
|
@ApiModelProperty("证件号码")
|
|
@ApiModelProperty("证件号码")
|
|
- @ExcelProperty("证件号码")
|
|
|
|
private String credentialsCode;
|
|
private String credentialsCode;
|
|
|
|
|
|
|
|
|
|
@ApiModelProperty("手机号码")
|
|
@ApiModelProperty("手机号码")
|
|
- @ExcelProperty("手机号码")
|
|
|
|
private String phone;
|
|
private String phone;
|
|
|
|
|
|
|
|
|
|
@@ -79,56 +66,45 @@ public class PersonVO implements Serializable {
|
|
private String populationType;
|
|
private String populationType;
|
|
|
|
|
|
@ApiModelProperty("人口类型:1:常住人口 2:暂住人口 3:境外长住人口 4:流动人口 5:寄住人口 6: 临时住宿人口 99其他")
|
|
@ApiModelProperty("人口类型:1:常住人口 2:暂住人口 3:境外长住人口 4:流动人口 5:寄住人口 6: 临时住宿人口 99其他")
|
|
- @ExcelProperty("人口类型")
|
|
|
|
private String populationTypeName;
|
|
private String populationTypeName;
|
|
|
|
|
|
@ApiModelProperty("民族")
|
|
@ApiModelProperty("民族")
|
|
- @ExcelProperty("民族")
|
|
|
|
private String nation;
|
|
private String nation;
|
|
|
|
|
|
|
|
|
|
@ApiModelProperty("政治面貌")
|
|
@ApiModelProperty("政治面貌")
|
|
- @ExcelProperty("政治面貌")
|
|
|
|
private String policitalStatus;
|
|
private String policitalStatus;
|
|
|
|
|
|
|
|
|
|
@ApiModelProperty("婚姻")
|
|
@ApiModelProperty("婚姻")
|
|
- @ExcelProperty("婚姻")
|
|
|
|
private String marriage;
|
|
private String marriage;
|
|
|
|
|
|
|
|
|
|
@ApiModelProperty("口音")
|
|
@ApiModelProperty("口音")
|
|
- @ExcelProperty("口音")
|
|
|
|
private String voice;
|
|
private String voice;
|
|
|
|
|
|
|
|
|
|
@ApiModelProperty("所属区域")
|
|
@ApiModelProperty("所属区域")
|
|
- @ExcelProperty("所属区域")
|
|
|
|
private String district;
|
|
private String district;
|
|
|
|
|
|
@ApiModelProperty("所属街道")
|
|
@ApiModelProperty("所属街道")
|
|
- @ExcelProperty("所属街道")
|
|
|
|
private String subdistrict;
|
|
private String subdistrict;
|
|
|
|
|
|
@ApiModelProperty("所属小区id")
|
|
@ApiModelProperty("所属小区id")
|
|
private Long communityId;
|
|
private Long communityId;
|
|
|
|
|
|
@ApiModelProperty("所属小区")
|
|
@ApiModelProperty("所属小区")
|
|
- @ExcelProperty("所属小区")
|
|
|
|
private String communityName;
|
|
private String communityName;
|
|
|
|
|
|
@ApiModelProperty("地址")
|
|
@ApiModelProperty("地址")
|
|
- @ExcelProperty("地址")
|
|
|
|
private String address;
|
|
private String address;
|
|
|
|
|
|
|
|
|
|
@ApiModelProperty("工作单位")
|
|
@ApiModelProperty("工作单位")
|
|
- @ExcelProperty("工作单位")
|
|
|
|
private String workPlace;
|
|
private String workPlace;
|
|
|
|
|
|
|
|
|
|
@ApiModelProperty("单位地址")
|
|
@ApiModelProperty("单位地址")
|
|
- @ExcelProperty("单位地址")
|
|
|
|
private String workAddress;
|
|
private String workAddress;
|
|
|
|
|
|
|
|
|
|
@@ -136,20 +112,16 @@ public class PersonVO implements Serializable {
|
|
private String type;
|
|
private String type;
|
|
|
|
|
|
@ApiModelProperty("类型名:2、重点人员,3、小区人员,多个用逗号分割")
|
|
@ApiModelProperty("类型名:2、重点人员,3、小区人员,多个用逗号分割")
|
|
- @ExcelProperty("类型名")
|
|
|
|
private String typeName;
|
|
private String typeName;
|
|
|
|
|
|
@ApiModelProperty("人群类型,多个用逗号分割")
|
|
@ApiModelProperty("人群类型,多个用逗号分割")
|
|
- @ExcelProperty("人群类型")
|
|
|
|
private String crowdName;
|
|
private String crowdName;
|
|
|
|
|
|
@ApiModelProperty("备注")
|
|
@ApiModelProperty("备注")
|
|
- @ExcelProperty("备注")
|
|
|
|
private String remark;
|
|
private String remark;
|
|
|
|
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
|
|
@ApiModelProperty("创建时间")
|
|
@ApiModelProperty("创建时间")
|
|
- @ExcelProperty("创建时间")
|
|
|
|
private Date createTime;
|
|
private Date createTime;
|
|
|
|
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
|
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
|