From b24f9c75c79e4de248505295bfea7055e4975ff4 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 25 五月 2021 14:23:04 +0800
Subject: [PATCH] Merge branch 'lyq' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java | 55 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
index 3f09a50..59abcbf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
@@ -36,16 +36,16 @@
private String road;
@ExcelProperty(value = "门牌号", index = 7)
- private Integer doorNo;
+ private String doorNo;
@ExcelProperty(value = "楼排号", index = 8)
private String floor;
@ExcelProperty(value = "单元号", index = 9)
- private Integer unitNo;
+ private String unitNo;
@ExcelProperty(value = "户室（房间号）", index = 10)
- private Integer houseNo;
+ private String houseNo;
@ExcelProperty(value = "联系方式", index = 11)
private String phone;
@@ -65,29 +65,56 @@
@ExcelProperty(value = "工作单位", index = 16)
private String workCompany;
- @ExcelProperty(value = "外地or本地（1.本地 2.外地）", index = 17)
- private Integer outOrLocal;
+ @ExcelProperty(value = "备注", index = 17)
+ private String remark;
@ExcelProperty(value = "户口所在地", index = 18)
private String censusRegister;
- @ExcelProperty(value = "备注", index = 19)
- private String remark;
+ @ExcelProperty(value = "外地or本地（1.本地 2.外地）", index = 19)
+ private Integer outOrLocal;
+ @ExcelProperty(value = "房屋状态(1.自住 2.租住 3.其他)", index = 20)
+ private Integer houseStatus;
+
+ @ExcelProperty(value = "房屋用途(1.住宅 2.公寓 3.宿舍 4.仓库 5.其他）", index = 21)
+ private Integer housePurpose;
+
+ @ExcelProperty(value = "管控状态(1.常规 2.关注 3.管控)", index = 22)
+ private Integer controlStatus;
+
+ @ExcelProperty(value = "是否是居住地(1.是 2.否)", index = 23)
+ private Integer isResidence;
+
+ /**
+ * 去重字段，使用（姓名+身份证号+街路巷+小区号+楼牌号+单元号+户室）组合字段进行MD5加密实现去重
+ */
+ private String distinctPass;
+
+ /**
+ * 年龄
+ */
private Integer age;
+ /**
+ * 性别（1.男 2.女）
+ */
private Integer sex;
+
+ /**
+ * 出生年月日
+ */
+ private String birthday;
+
+ /**
+ * 房屋地址
+ */
+ private String address;
+
/**
* 扩展字段用逗号隔开
*/
private List<String> userTagStr = Lists.newArrayList();
- /**
- * 外地or本地(1.本地 2.外地)
- */
- public interface outOrLocal{
- String bd = "本地";
- String wd = "外地";
- }
}
--
Gitblit v1.7.1