From bbda2ee1af4e86d76f93e00386d77efb56c60d5f Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期六, 23 七月 2022 15:42:06 +0800
Subject: [PATCH] bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/EexcelUserDTO.java |   77 +++++++++++++++++++++++++++++++-------
 1 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/EexcelUserDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/EexcelUserDTO.java
index 2ee562d..609e1cb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/EexcelUserDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/EexcelUserDTO.java
@@ -1,99 +1,146 @@
 package com.panzhihua.common.model.dtos.user;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import lombok.Data;
+
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
  * @description: 居民信息excel导入
  * @author: huang.hongfa weixin hhf9596 qq 959656820
  * @create: 2021-02-04 16:06
  **/
+@Data
 public class EexcelUserDTO {
 
     /**
      * 序号
      */
-    private Integer order;
+    @ExcelProperty("序号")
+    private String order;
+
+    @ExcelProperty("小区")
+    private String areaName;
+
     /**
      * 门牌号
      */
+    @ExcelProperty("门牌号")
     private String doorNumber;
     /**
      * 是否租住
      */
-    private String isRent;
+    @ExcelProperty("是否租住")
+    private String isRent = "否";
     /**
      * 姓名
      */
+    @ExcelProperty("姓名")
     private String name;
     /**
      * 民族
      */
+    @ExcelProperty("民族")
     private String nation;
     /**
      * 政治面貌
      */
+    @ExcelProperty("政治面貌")
     private String politicalOutlook;
     /**
      * 婚姻状态
      */
-    private String maritalStatus;
+    @ExcelProperty("婚姻状态")
+    private String maritalStatus = "否";
     /**
      * 联系方式
      */
+    @ExcelProperty("联系方式")
     private String phone;
     /**
      * 文化程度
      */
+    @ExcelProperty("文化程度")
     private String education;
     /**
      * 身份证
      */
+    @ExcelProperty("身份证")
     private String idCard;
     /**
      * 工作单位（学校）
      */
+    @ExcelProperty("工作单位（学校）")
     private String company;
     /**
      * 户口所在地
      */
+    @ExcelProperty("户口所在地")
     private String residence;
     /**
      * 目前是否在攀枝花
      */
-    private String isPanZhiHua;
+    @ExcelProperty("目前是否在攀枝花")
+    private String isPanZhiHua = "否";
     /**
      * 近一个月离（返）攀情况
      */
-    private String situation;
+    @ExcelProperty("近一个月离（返）攀情况")
+    private String situation = "否";
     /**
      * 是否有与疑似或确诊病例密切接触史
      */
-    private String isContact;
+    @ExcelProperty("是否有与疑似或确诊病例密切接触史")
+    private String isContact = "否";
     /**
      * 特殊情况（重大过往病史或者孕妇）
      */
-    private String major;
+    @ExcelProperty("特殊情况（重大过往病史或者孕妇")
+    private String major = "否";
     /**
      * 退役军人
      */
-    private String soldier;
+    @ExcelProperty("退役军人")
+    private String soldier = "否";
+    /**
+     * 残疾人
+     */
+    @ExcelProperty("残疾人")
+    private String disability = "否";
     /**
      * 低保户
      */
-    private String lowIncomeHouseholds;
+    @ExcelProperty("低保户")
+    private String lowIncomeHouseholds = "否";
     /**
      * 低收入人员
      */
-    private String lowIncomePeople;
+    @ExcelProperty("低收入人员")
+    private String lowIncomePeople = "否";
     /**
      * 高龄老人
      */
-    private String oldPeople;
+    @ExcelProperty("高龄老人")
+    private String oldPeople = "否";
     /**
-     *特服家庭
+     * 特服家庭
      */
-    private String specialServiceFamily;
+    @ExcelProperty("特服家庭")
+    private String specialServiceFamily = "否";
     /**
-     *重点人员
+     * 重点人员
      */
-    private String keyPersonnel;
+    @ExcelProperty("重点人员")
+    private String keyPersonnel = "否";
+
+    @ExcelProperty("标签")
+    private String tags;
+
+    /**
+     * 房屋编码
+     */
+    @ExcelIgnore
+    private String houseCode;
+
 }

--
Gitblit v1.7.1