From 8a6375edade9f1edc194a0381369fe94e56c13c7 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 13 八月 2021 13:16:36 +0800
Subject: [PATCH] Merge branch 'txb'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCorrectExcelListen.java | 4
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDisabilityExcelListen.java | 3
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationVeteransExcelListen.java | 89 ++--
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationSentenceExcelListen.java | 87 ++--
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulIsRentEnum.java | 42 ++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRelationEnum.java | 4
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCultExcelListen.java | 3
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java | 87 ++--
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/PopulationApi.java | 248 +++++++------
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java | 87 ++--
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 126 ++++--
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationLowSecurityExcelListen.java | 87 ++--
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java | 18
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationKeyExcelListen.java | 89 ++--
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java | 89 ++--
17 files changed, 585 insertions(+), 499 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulIsRentEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulIsRentEnum.java
new file mode 100644
index 0000000..ae0485c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulIsRentEnum.java
@@ -0,0 +1,42 @@
+package com.panzhihua.common.enums;
+
+import lombok.Getter;
+
+/**
+ * 是否状态
+ *
+ * @author huanghongfa
+ */
+@Getter
+public enum PopulIsRentEnum
+{
+ YES(1, "租住"), NO(0, "自住");
+
+ private final Integer code;
+ private final String name;
+
+ PopulIsRentEnum(Integer code, String name)
+ {
+ this.code = code;
+ this.name = name;
+ }
+
+ public static int getCodeByName(String name) {
+ for (PopulIsRentEnum item : PopulIsRentEnum.values()) {
+ if (item.name.equals(name)) {
+ return item.getCode();
+ }
+ }
+ return 0;
+ }
+
+ public static String getCnDescByName(Integer code) {
+ for (PopulIsRentEnum item : PopulIsRentEnum.values()) {
+ if (item.code.equals(code)) {
+ return item.getName();
+ }
+ }
+ return "否";
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRelationEnum.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRelationEnum.java
index d13ddb3..162d6e6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRelationEnum.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRelationEnum.java
@@ -10,8 +10,8 @@
@Getter
public enum PopulRelationEnum
{
- relation01(01, "本人"),
- relation02(02, "户主"),
+ relation01(1, "本人"),
+ relation02(2, "户主"),
relation10(10, "配偶"),
relation11(11, "夫"),
relation12(12, "妻"),
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCorrectExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCorrectExcelListen.java
index 9f2d360..22a5fc5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCorrectExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCorrectExcelListen.java
@@ -141,7 +141,6 @@
vo.setSerialNumber(oneData.get(0));
}
//姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
- if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(3))){
if(StringUtils.isEmpty(oneData.get(1))){
ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
index++;
@@ -188,7 +187,6 @@
}else{
vo.setSex(PopulSexEnum.nv.getCode());
}
- }
if(StringUtils.isNotEmpty(oneData.get(2))){
vo.setNation(oneData.get(2));
}
@@ -473,7 +471,7 @@
if(StringUtils.isNotEmpty(oneData.get(46))){
vo.setRemark(oneData.get(46).trim());
}
- vo.getUserTagStr().add("社区矫正人员");
+ vo.getUserTagStr().add("社区矫正");
for (int i = 47; i < headSize; i++) {
if (oneData.get(i) != null && oneData.get(i).equals("是")) {
vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCultExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCultExcelListen.java
index 2f512fe..4646de5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCultExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCultExcelListen.java
@@ -131,7 +131,6 @@
vo.setSerialNumber(oneData.get(0));
}
//姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
- if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(2))){
if(StringUtils.isEmpty(oneData.get(1))){
ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO();
index++;
@@ -178,7 +177,7 @@
}else{
vo.setSex(PopulSexEnum.nv.getCode());
}
- }
+
if(StringUtils.isNotEmpty(oneData.get(3))){
vo.setNation(oneData.get(3));
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDisabilityExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDisabilityExcelListen.java
index 0101180..d18840a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDisabilityExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDisabilityExcelListen.java
@@ -131,7 +131,6 @@
vo.setSerialNumber(oneData.get(0));
}
//姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
- if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(2))){
if(StringUtils.isEmpty(oneData.get(1))){
ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO();
index++;
@@ -178,7 +177,7 @@
}else{
vo.setSex(PopulSexEnum.nv.getCode());
}
- }
+
if(StringUtils.isNotEmpty(oneData.get(3))){
vo.setCertificateSituation(oneData.get(3));
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java
index 2932f12..666e0f5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java
@@ -144,54 +144,53 @@
vo.setSerialNumber(oneData.get(0));
}
//姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
- if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(3))){
- if(StringUtils.isEmpty(oneData.get(1))){
- ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
- index++;
- setDrugMistake(oneData, mistake);
- mistake.setMistake("名字不可为空，请填写姓名");
- mistakes.add(mistake);
- continue;
- }
- vo.setName(oneData.get(1));
- if(StringUtils.isEmpty(oneData.get(3))){
- ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
- index++;
- setDrugMistake(oneData, mistake);
- mistake.setMistake("身份证号不可为空，请填写身份证");
- mistakes.add(mistake);
- continue;
- }
+ if(StringUtils.isEmpty(oneData.get(1))){
+ ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+ index++;
+ setDrugMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(1));
+ if(StringUtils.isEmpty(oneData.get(3))){
+ ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+ index++;
+ setDrugMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
- //判断身份证号码位数
- if(oneData.get(3).length() != 18){
- ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
- index++;
- setDrugMistake(oneData, mistake);
- mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
- mistakes.add(mistake);
- continue;
- }
- vo.setCardNo(oneData.get(3).toUpperCase());
- //根据身份证号码解析年龄以及性别
- //获取用户生日
- String birthday = vo.getCardNo().substring(6, 14);
- if(StringUtils.isNotEmpty(birthday)){
- String year = birthday.substring(0,4);
- String month = birthday.substring(4,6);
- String day = birthday.substring(6,8);
- vo.setBirthday(year + "-" + month + "-" + day);
- }
+ //判断身份证号码位数
+ if(oneData.get(3).length() != 18){
+ ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+ index++;
+ setDrugMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(3).toUpperCase());
+ //根据身份证号码解析年龄以及性别
+ //获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if(StringUtils.isNotEmpty(birthday)){
+ String year = birthday.substring(0,4);
+ String month = birthday.substring(4,6);
+ String day = birthday.substring(6,8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
// //设置用户年龄
// vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
- //获取用户性别
- int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
- if(sex%2 == 1){
- vo.setSex(PopulSexEnum.nan.getCode());
- }else{
- vo.setSex(PopulSexEnum.nv.getCode());
- }
+ //获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if(sex%2 == 1){
+ vo.setSex(PopulSexEnum.nan.getCode());
+ }else{
+ vo.setSex(PopulSexEnum.nv.getCode());
}
+
if(StringUtils.isNotEmpty(oneData.get(2))){
vo.setNation(oneData.get(2));
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationKeyExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationKeyExcelListen.java
index 65233ee..50a21fc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationKeyExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationKeyExcelListen.java
@@ -139,54 +139,53 @@
vo.setSerialNumber(oneData.get(0));
}
//姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
- if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(3))){
- if(StringUtils.isEmpty(oneData.get(1))){
- ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
- index++;
- setKeyMistake(oneData, mistake);
- mistake.setMistake("名字不可为空，请填写姓名");
- mistakes.add(mistake);
- continue;
- }
- vo.setName(oneData.get(1));
- if(StringUtils.isEmpty(oneData.get(3))){
- ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
- index++;
- setKeyMistake(oneData, mistake);
- mistake.setMistake("身份证号不可为空，请填写身份证");
- mistakes.add(mistake);
- continue;
- }
+ if(StringUtils.isEmpty(oneData.get(1))){
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ index++;
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(1));
+ if(StringUtils.isEmpty(oneData.get(3))){
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ index++;
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
- //判断身份证号码位数
- if(oneData.get(3).length() != 18){
- ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
- index++;
- setKeyMistake(oneData, mistake);
- mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
- mistakes.add(mistake);
- continue;
- }
- vo.setCardNo(oneData.get(3).toUpperCase());
- //根据身份证号码解析年龄以及性别
- //获取用户生日
- String birthday = vo.getCardNo().substring(6, 14);
- if(StringUtils.isNotEmpty(birthday)){
- String year = birthday.substring(0,4);
- String month = birthday.substring(4,6);
- String day = birthday.substring(6,8);
- vo.setBirthday(year + "-" + month + "-" + day);
- }
+ //判断身份证号码位数
+ if(oneData.get(3).length() != 18){
+ ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO();
+ index++;
+ setKeyMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(3).toUpperCase());
+ //根据身份证号码解析年龄以及性别
+ //获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if(StringUtils.isNotEmpty(birthday)){
+ String year = birthday.substring(0,4);
+ String month = birthday.substring(4,6);
+ String day = birthday.substring(6,8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
// //设置用户年龄
// vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
- //获取用户性别
- int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
- if(sex%2 == 1){
- vo.setSex(PopulSexEnum.nan.getCode());
- }else{
- vo.setSex(PopulSexEnum.nv.getCode());
- }
+ //获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if(sex%2 == 1){
+ vo.setSex(PopulSexEnum.nan.getCode());
+ }else{
+ vo.setSex(PopulSexEnum.nv.getCode());
}
+
if(StringUtils.isNotEmpty(oneData.get(2))){
vo.setNation(oneData.get(2));
}
@@ -317,7 +316,7 @@
if(StringUtils.isNotEmpty(oneData.get(17))){
vo.setRemark(oneData.get(17).trim());
}
- vo.getUserTagStr().add("重点上访人员");
+ vo.getUserTagStr().add("重点人员");
for (int i = 18; i < headSize; i++) {
if (oneData.get(i) != null && oneData.get(i).equals("是")) {
vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationLowSecurityExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationLowSecurityExcelListen.java
index fe83163..a348167 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationLowSecurityExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationLowSecurityExcelListen.java
@@ -133,54 +133,53 @@
vo.setSerialNumber(oneData.get(0));
}
//姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
- if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(2))){
- if(StringUtils.isEmpty(oneData.get(1))){
- ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
- index++;
- setLowSecurityMistake(oneData, mistake);
- mistake.setMistake("名字不可为空，请填写姓名");
- mistakes.add(mistake);
- continue;
- }
- vo.setName(oneData.get(1));
- if(StringUtils.isEmpty(oneData.get(2))){
- ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
- index++;
- setLowSecurityMistake(oneData, mistake);
- mistake.setMistake("身份证号不可为空，请填写身份证");
- mistakes.add(mistake);
- continue;
- }
+ if(StringUtils.isEmpty(oneData.get(1))){
+ ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
+ index++;
+ setLowSecurityMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(1));
+ if(StringUtils.isEmpty(oneData.get(2))){
+ ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
+ index++;
+ setLowSecurityMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
- //判断身份证号码位数
- if(oneData.get(2).length() != 18){
- ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
- index++;
- setLowSecurityMistake(oneData, mistake);
- mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
- mistakes.add(mistake);
- continue;
- }
- vo.setCardNo(oneData.get(2).toUpperCase());
- //根据身份证号码解析年龄以及性别
- //获取用户生日
- String birthday = vo.getCardNo().substring(6, 14);
- if(StringUtils.isNotEmpty(birthday)){
- String year = birthday.substring(0,4);
- String month = birthday.substring(4,6);
- String day = birthday.substring(6,8);
- vo.setBirthday(year + "-" + month + "-" + day);
- }
+ //判断身份证号码位数
+ if(oneData.get(2).length() != 18){
+ ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO();
+ index++;
+ setLowSecurityMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(2).toUpperCase());
+ //根据身份证号码解析年龄以及性别
+ //获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if(StringUtils.isNotEmpty(birthday)){
+ String year = birthday.substring(0,4);
+ String month = birthday.substring(4,6);
+ String day = birthday.substring(6,8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
// //设置用户年龄
// vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
- //获取用户性别
- int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
- if(sex%2 == 1){
- vo.setSex(PopulSexEnum.nan.getCode());
- }else{
- vo.setSex(PopulSexEnum.nv.getCode());
- }
+ //获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if(sex%2 == 1){
+ vo.setSex(PopulSexEnum.nan.getCode());
+ }else{
+ vo.setSex(PopulSexEnum.nv.getCode());
}
+
if(StringUtils.isNotEmpty(oneData.get(3))){
vo.setPhone(oneData.get(3));
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java
index 957255e..071226b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java
@@ -139,54 +139,53 @@
vo.setSerialNumber(oneData.get(0));
}
//姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
- if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(2))){
- if(StringUtils.isEmpty(oneData.get(1))){
- ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
- index++;
- setMistake(oneData, mistake);
- mistake.setMistake("名字不可为空，请填写姓名");
- mistakes.add(mistake);
- continue;
- }
- vo.setName(oneData.get(1));
- if(StringUtils.isEmpty(oneData.get(2))){
- ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
- index++;
- setMistake(oneData, mistake);
- mistake.setMistake("身份证号不可为空，请填写身份证");
- mistakes.add(mistake);
- continue;
- }
+ if(StringUtils.isEmpty(oneData.get(1))){
+ ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(1));
+ if(StringUtils.isEmpty(oneData.get(2))){
+ ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
- //判断身份证号码位数
- if(oneData.get(2).length() != 18){
- ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
- index++;
- setMistake(oneData, mistake);
- mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
- mistakes.add(mistake);
- continue;
- }
- vo.setCardNo(oneData.get(2).toUpperCase());
- //根据身份证号码解析年龄以及性别
- //获取用户生日
- String birthday = vo.getCardNo().substring(6, 14);
- if(StringUtils.isNotEmpty(birthday)){
- String year = birthday.substring(0,4);
- String month = birthday.substring(4,6);
- String day = birthday.substring(6,8);
- vo.setBirthday(year + "-" + month + "-" + day);
- }
+ //判断身份证号码位数
+ if(oneData.get(2).length() != 18){
+ ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(2).toUpperCase());
+ //根据身份证号码解析年龄以及性别
+ //获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if(StringUtils.isNotEmpty(birthday)){
+ String year = birthday.substring(0,4);
+ String month = birthday.substring(4,6);
+ String day = birthday.substring(6,8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
// //设置用户年龄
// vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
- //获取用户性别
- int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
- if(sex%2 == 1){
- vo.setSex(PopulSexEnum.nan.getCode());
- }else{
- vo.setSex(PopulSexEnum.nv.getCode());
- }
+ //获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if(sex%2 == 1){
+ vo.setSex(PopulSexEnum.nan.getCode());
+ }else{
+ vo.setSex(PopulSexEnum.nv.getCode());
}
+
if(StringUtils.isEmpty(oneData.get(3))){
index++;
ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
@@ -379,7 +378,7 @@
if(StringUtils.isNotEmpty(oneData.get(28))){
vo.setCrimeSutiation(oneData.get(28).trim());
}
- vo.getUserTagStr().add("重精人员");
+ vo.getUserTagStr().add("精神障碍患者");
for (int i = 29; i < headSize; i++) {
if (oneData.get(i) != null && oneData.get(i).equals("是")) {
vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java
index f20d7f2..4e88663 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java
@@ -141,54 +141,53 @@
vo.setSerialNumber(oneData.get(0));
}
//姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
- if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(3))){
- if(StringUtils.isEmpty(oneData.get(1))){
- ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
- index++;
- setRehabilitationMistake(oneData, mistake);
- mistake.setMistake("名字不可为空，请填写姓名");
- mistakes.add(mistake);
- continue;
- }
- vo.setName(oneData.get(1));
- if(StringUtils.isEmpty(oneData.get(3))){
- ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
- index++;
- setRehabilitationMistake(oneData, mistake);
- mistake.setMistake("身份证号不可为空，请填写身份证");
- mistakes.add(mistake);
- continue;
- }
+ if(StringUtils.isEmpty(oneData.get(1))){
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ index++;
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(1));
+ if(StringUtils.isEmpty(oneData.get(3))){
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ index++;
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
- //判断身份证号码位数
- if(oneData.get(3).length() != 18){
- ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
- index++;
- setRehabilitationMistake(oneData, mistake);
- mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
- mistakes.add(mistake);
- continue;
- }
- vo.setCardNo(oneData.get(3).toUpperCase());
- //根据身份证号码解析年龄以及性别
- //获取用户生日
- String birthday = vo.getCardNo().substring(6, 14);
- if(StringUtils.isNotEmpty(birthday)){
- String year = birthday.substring(0,4);
- String month = birthday.substring(4,6);
- String day = birthday.substring(6,8);
- vo.setBirthday(year + "-" + month + "-" + day);
- }
+ //判断身份证号码位数
+ if(oneData.get(3).length() != 18){
+ ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO();
+ index++;
+ setRehabilitationMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(3).toUpperCase());
+ //根据身份证号码解析年龄以及性别
+ //获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if(StringUtils.isNotEmpty(birthday)){
+ String year = birthday.substring(0,4);
+ String month = birthday.substring(4,6);
+ String day = birthday.substring(6,8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
// //设置用户年龄
// vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
- //获取用户性别
- int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
- if(sex%2 == 1){
- vo.setSex(PopulSexEnum.nan.getCode());
- }else{
- vo.setSex(PopulSexEnum.nv.getCode());
- }
+ //获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if(sex%2 == 1){
+ vo.setSex(PopulSexEnum.nan.getCode());
+ }else{
+ vo.setSex(PopulSexEnum.nv.getCode());
}
+
if(StringUtils.isNotEmpty(oneData.get(2))){
vo.setNation(oneData.get(2));
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationSentenceExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationSentenceExcelListen.java
index abf12fb..9c2c0e3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationSentenceExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationSentenceExcelListen.java
@@ -141,54 +141,53 @@
vo.setSerialNumber(oneData.get(0));
}
//姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
- if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(3))){
- if(StringUtils.isEmpty(oneData.get(1))){
- ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
- index++;
- setSentenceMistake(oneData, mistake);
- mistake.setMistake("名字不可为空，请填写姓名");
- mistakes.add(mistake);
- continue;
- }
- vo.setName(oneData.get(1));
- if(StringUtils.isEmpty(oneData.get(3))){
- ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
- index++;
- setSentenceMistake(oneData, mistake);
- mistake.setMistake("身份证号不可为空，请填写身份证");
- mistakes.add(mistake);
- continue;
- }
+ if(StringUtils.isEmpty(oneData.get(1))){
+ ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
+ index++;
+ setSentenceMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(1));
+ if(StringUtils.isEmpty(oneData.get(3))){
+ ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
+ index++;
+ setSentenceMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
- //判断身份证号码位数
- if(oneData.get(3).length() != 18){
- ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
- index++;
- setSentenceMistake(oneData, mistake);
- mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
- mistakes.add(mistake);
- continue;
- }
- vo.setCardNo(oneData.get(3).toUpperCase());
- //根据身份证号码解析年龄以及性别
- //获取用户生日
- String birthday = vo.getCardNo().substring(6, 14);
- if(StringUtils.isNotEmpty(birthday)){
- String year = birthday.substring(0,4);
- String month = birthday.substring(4,6);
- String day = birthday.substring(6,8);
- vo.setBirthday(year + "-" + month + "-" + day);
- }
+ //判断身份证号码位数
+ if(oneData.get(3).length() != 18){
+ ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO();
+ index++;
+ setSentenceMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(3).toUpperCase());
+ //根据身份证号码解析年龄以及性别
+ //获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if(StringUtils.isNotEmpty(birthday)){
+ String year = birthday.substring(0,4);
+ String month = birthday.substring(4,6);
+ String day = birthday.substring(6,8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
// //设置用户年龄
// vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
- //获取用户性别
- int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
- if(sex%2 == 1){
- vo.setSex(PopulSexEnum.nan.getCode());
- }else{
- vo.setSex(PopulSexEnum.nv.getCode());
- }
+ //获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if(sex%2 == 1){
+ vo.setSex(PopulSexEnum.nan.getCode());
+ }else{
+ vo.setSex(PopulSexEnum.nv.getCode());
}
+
if(StringUtils.isNotEmpty(oneData.get(2))){
vo.setNation(oneData.get(2));
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationVeteransExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationVeteransExcelListen.java
index f755d4e..d6127a2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationVeteransExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationVeteransExcelListen.java
@@ -131,54 +131,53 @@
vo.setSerialNumber(oneData.get(0));
}
//姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
- if(StringUtils.isNotEmpty(oneData.get(3)) || StringUtils.isNotEmpty(oneData.get(4))){
- if(StringUtils.isEmpty(oneData.get(3))){
- ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
- index++;
- setVeteransMistake(oneData, mistake);
- mistake.setMistake("名字不可为空，请填写姓名");
- mistakes.add(mistake);
- continue;
- }
- vo.setName(oneData.get(3));
- if(StringUtils.isEmpty(oneData.get(4))){
- ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
- index++;
- setVeteransMistake(oneData, mistake);
- mistake.setMistake("身份证号不可为空，请填写身份证");
- mistakes.add(mistake);
- continue;
- }
+ if(StringUtils.isEmpty(oneData.get(3))){
+ ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ index++;
+ setVeteransMistake(oneData, mistake);
+ mistake.setMistake("名字不可为空，请填写姓名");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setName(oneData.get(3));
+ if(StringUtils.isEmpty(oneData.get(4))){
+ ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ index++;
+ setVeteransMistake(oneData, mistake);
+ mistake.setMistake("身份证号不可为空，请填写身份证");
+ mistakes.add(mistake);
+ continue;
+ }
- //判断身份证号码位数
- if(oneData.get(4).length() != 18){
- ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
- index++;
- setVeteransMistake(oneData, mistake);
- mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
- mistakes.add(mistake);
- continue;
- }
- vo.setCardNo(oneData.get(4).toUpperCase());
- //根据身份证号码解析年龄以及性别
- //获取用户生日
- String birthday = vo.getCardNo().substring(6, 14);
- if(StringUtils.isNotEmpty(birthday)){
- String year = birthday.substring(0,4);
- String month = birthday.substring(4,6);
- String day = birthday.substring(6,8);
- vo.setBirthday(year + "-" + month + "-" + day);
- }
+ //判断身份证号码位数
+ if(oneData.get(4).length() != 18){
+ ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+ index++;
+ setVeteransMistake(oneData, mistake);
+ mistake.setMistake("身份证号位数有误，请检查身份证号码是否正确");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setCardNo(oneData.get(4).toUpperCase());
+ //根据身份证号码解析年龄以及性别
+ //获取用户生日
+ String birthday = vo.getCardNo().substring(6, 14);
+ if(StringUtils.isNotEmpty(birthday)){
+ String year = birthday.substring(0,4);
+ String month = birthday.substring(4,6);
+ String day = birthday.substring(6,8);
+ vo.setBirthday(year + "-" + month + "-" + day);
+ }
// //设置用户年龄
// vo.setAge(AgeUtils.getAgeFromBirthTime(birthday));
- //获取用户性别
- int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
- if(sex%2 == 1){
- vo.setSex(PopulSexEnum.nan.getCode());
- }else{
- vo.setSex(PopulSexEnum.nv.getCode());
- }
+ //获取用户性别
+ int sex = Integer.parseInt(vo.getCardNo().substring(16, 17));
+ if(sex%2 == 1){
+ vo.setSex(PopulSexEnum.nan.getCode());
+ }else{
+ vo.setSex(PopulSexEnum.nv.getCode());
}
+
if(StringUtils.isNotEmpty(oneData.get(1))){
vo.setPersonStatus(oneData.get(1));
}
@@ -354,7 +353,7 @@
index++;
ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
setVeteransMistake(oneData, mistake);
- mistake.setMistake("您填写的政治面貌有误");
+ mistake.setMistake("您填写的婚姻关系·有误");
mistakes.add(mistake);
continue;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
index d0f1fde..bfde4ee 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVO.java
@@ -194,31 +194,31 @@
private List<ComMngPopulationCarVO> carList;
@ApiModelProperty("吸毒信息")
- private ComDrugPopulationVO comDrugPopulationVO;
+ private List<ComDrugPopulationVO> comDrugPopulationVOs;
@ApiModelProperty("社区矫正信息")
- private ComCorrectPopulationVO comCorrectPopulationVO;
+ private List<ComCorrectPopulationVO> comCorrectPopulationVOs;
@ApiModelProperty("精神障碍信息")
- private ComMajorPopulationVO comMajorPopulationVO;
+ private List<ComMajorPopulationVO> comMajorPopulationVOs;
@ApiModelProperty("邪教信息")
- private ComCultPopulationVO comCultPopulationVO;
+ private List<ComCultPopulationVO> comCultPopulationVOs;
@ApiModelProperty("刑释信息")
- private ComRehabilitationPopulationVO comRehabilitationPopulationVO;
+ private List<ComRehabilitationPopulationVO> comRehabilitationPopulationVOs;
@ApiModelProperty("上访信息")
- private ComKeyPopulationVO comKeyPopulationVO;
+ private List<ComKeyPopulationVO> comKeyPopulationVOs;
@ApiModelProperty("退役军人信息")
- private ComVeteransPopulationVO comVeteransPopulationVO;
+ private List<ComVeteransPopulationVO> comVeteransPopulationVOs;
@ApiModelProperty("残疾人信息")
- private ComDisabilityPopulationVO comDisabilityPopulationVO;
+ private List<ComDisabilityPopulationVO> comDisabilityPopulationVOs;
@ApiModelProperty("低保户信息")
- private ComLowSecurityPopulationVO comLowSecurityPopulationVO;
+ private List<ComLowSecurityPopulationVO> comLowSecurityPopulationVOs;
public interface sex{
int nan = 1;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java
index 0a3e756..fc4ac3e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityManagerApi.java
@@ -623,6 +623,7 @@
String url=excelUrl;
String uuid= UUID.randomUUID().toString().replace("-","");
String name=uuid+".xlsx";
+ String _name="小程序用户管理.xlsx";
String ftpUrl="/mnt/data/web/excel/";
// 用户搜索了就下载搜索的用户否则下载所有用户
R r=userService.export(exportUserDTO);
@@ -661,7 +662,7 @@
}
}
}
- return R.ok(url+name);
+ return R.ok(url+_name);
} catch (Exception e) {
e.printStackTrace();
log.error("文件传输失败【{}】", e.getMessage());
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/PopulationApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/PopulationApi.java
index cfd2643..f55b525 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/PopulationApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/PopulationApi.java
@@ -444,9 +444,11 @@
List<String> TagsList = (List<String>)tagsResult.getData();
//动态加载标签列表到表头
for (int i = 0; i < TagsList.size(); i++) {
- List<String> head = new ArrayList<>();
- head.add(TagsList.get(i) + "(是/否)");
- list.add(head);
+ if (!"吸毒人员".equals(TagsList.get(i))) {
+ List<String> head = new ArrayList<>();
+ head.add(TagsList.get(i) + "(是/否)");
+ list.add(head);
+ }
}
}
EasyExcel.write(fileName).head(list).sheet("吸毒人员导入模板").doWrite(dataList);
@@ -502,9 +504,11 @@
List<String> TagsList = (List<String>)tagsResult.getData();
//动态加载标签列表到表头
for (int i = 0; i < TagsList.size(); i++) {
- List<String> head = new ArrayList<>();
- head.add(TagsList.get(i) + "(是/否)");
- list.add(head);
+ if (!"社区矫正".equals(TagsList.get(i))) {
+ List<String> head = new ArrayList<>();
+ head.add(TagsList.get(i) + "(是/否)");
+ list.add(head);
+ }
}
}
EasyExcel.write(fileName).head(list).sheet("社区矫正人员导入模板").doWrite(dataList);
@@ -560,9 +564,11 @@
List<String> TagsList = (List<String>)tagsResult.getData();
//动态加载标签列表到表头
for (int i = 0; i < TagsList.size(); i++) {
- List<String> head = new ArrayList<>();
- head.add(TagsList.get(i) + "(是/否)");
- list.add(head);
+ if (!"精神障碍患者".equals(TagsList.get(i))) {
+ List<String> head = new ArrayList<>();
+ head.add(TagsList.get(i) + "(是/否)");
+ list.add(head);
+ }
}
}
EasyExcel.write(fileName).head(list).sheet("重精人员导入模板").doWrite(dataList);
@@ -618,9 +624,11 @@
List<String> TagsList = (List<String>)tagsResult.getData();
//动态加载标签列表到表头
for (int i = 0; i < TagsList.size(); i++) {
- List<String> head = new ArrayList<>();
- head.add(TagsList.get(i) + "(是/否)");
- list.add(head);
+ if (!"邪教人员".equals(TagsList.get(i))) {
+ List<String> head = new ArrayList<>();
+ head.add(TagsList.get(i) + "(是/否)");
+ list.add(head);
+ }
}
}
EasyExcel.write(fileName).head(list).sheet("邪教人员导入模板").doWrite(dataList);
@@ -676,9 +684,11 @@
List<String> TagsList = (List<String>)tagsResult.getData();
//动态加载标签列表到表头
for (int i = 0; i < TagsList.size(); i++) {
- List<String> head = new ArrayList<>();
- head.add(TagsList.get(i) + "(是/否)");
- list.add(head);
+ if (!"刑满释放".equals(TagsList.get(i))) {
+ List<String> head = new ArrayList<>();
+ head.add(TagsList.get(i) + "(是/否)");
+ list.add(head);
+ }
}
}
EasyExcel.write(fileName).head(list).sheet("刑释人员导入模板").doWrite(dataList);
@@ -735,9 +745,11 @@
List<String> TagsList = (List<String>)tagsResult.getData();
//动态加载标签列表到表头
for (int i = 0; i < TagsList.size(); i++) {
- List<String> head = new ArrayList<>();
- head.add(TagsList.get(i) + "(是/否)");
- list.add(head);
+ if (!"重点人员".equals(TagsList.get(i))) {
+ List<String> head = new ArrayList<>();
+ head.add(TagsList.get(i) + "(是/否)");
+ list.add(head);
+ }
}
}
EasyExcel.write(fileName).head(list).sheet("重点上访人员导入模板").doWrite(dataList);
@@ -792,9 +804,11 @@
List<String> TagsList = (List<String>)tagsResult.getData();
//动态加载标签列表到表头
for (int i = 0; i < TagsList.size(); i++) {
- List<String> head = new ArrayList<>();
- head.add(TagsList.get(i) + "(是/否)");
- list.add(head);
+ if (!"服刑人员".equals(TagsList.get(i))) {
+ List<String> head = new ArrayList<>();
+ head.add(TagsList.get(i) + "(是/否)");
+ list.add(head);
+ }
}
}
EasyExcel.write(fileName).head(list).sheet("服刑人员导入模板").doWrite(dataList);
@@ -850,9 +864,11 @@
List<String> TagsList = (List<String>)tagsResult.getData();
//动态加载标签列表到表头
for (int i = 0; i < TagsList.size(); i++) {
- List<String> head = new ArrayList<>();
- head.add(TagsList.get(i) + "(是/否)");
- list.add(head);
+ if (!"退役军人".equals(TagsList.get(i))) {
+ List<String> head = new ArrayList<>();
+ head.add(TagsList.get(i) + "(是/否)");
+ list.add(head);
+ }
}
}
EasyExcel.write(fileName).head(list).sheet("退役军人导入模板").doWrite(dataList);
@@ -908,9 +924,11 @@
List<String> TagsList = (List<String>)tagsResult.getData();
//动态加载标签列表到表头
for (int i = 0; i < TagsList.size(); i++) {
- List<String> head = new ArrayList<>();
- head.add(TagsList.get(i) + "(是/否)");
- list.add(head);
+ if (!"残疾人".equals(TagsList.get(i))) {
+ List<String> head = new ArrayList<>();
+ head.add(TagsList.get(i) + "(是/否)");
+ list.add(head);
+ }
}
}
EasyExcel.write(fileName).head(list).sheet("残疾人导入模板").doWrite(dataList);
@@ -966,9 +984,11 @@
List<String> TagsList = (List<String>)tagsResult.getData();
//动态加载标签列表到表头
for (int i = 0; i < TagsList.size(); i++) {
- List<String> head = new ArrayList<>();
- head.add(TagsList.get(i) + "(是/否)");
- list.add(head);
+ if (!"低保户".equals(TagsList.get(i))) {
+ List<String> head = new ArrayList<>();
+ head.add(TagsList.get(i) + "(是/否)");
+ list.add(head);
+ }
}
}
EasyExcel.write(fileName).head(list).sheet("低保户导入模板").doWrite(dataList);
@@ -1016,9 +1036,9 @@
List<String> head5 = new ArrayList<String>();
head5.add("与户主关系");
List<String> head6 = new ArrayList<String>();
- head6.add("街/路/巷");
+ head6.add("*街/路/巷");
List<String> head7 = new ArrayList<String>();
- head7.add("小区号（政府对于每个小区都有特定编号）");
+ head7.add("*小区号（政府对于每个小区都有特定编号）");
List<String> head8 = new ArrayList<String>();
head8.add("楼排号");
List<String> head9 = new ArrayList<String>();
@@ -1156,19 +1176,19 @@
List<String> head6 = new ArrayList<String>();
head6.add("*小区号（政府对于每个小区都有特定编号）");
List<String> head7 = new ArrayList<String>();
- head7.add("*楼排号");
+ head7.add("楼排号");
List<String> head8 = new ArrayList<String>();
- head8.add("*单元号");
+ head8.add("单元号");
List<String> head9 = new ArrayList<String>();
- head9.add("*户室（四位数表示。前两位楼层，后两位户号）");
+ head9.add("户室（四位数表示。前两位楼层，后两位户号）");
List<String> head10 = new ArrayList<String>();
- head10.add("*是否租住（自住/租住）");
+ head10.add("是否租住（是/否）");
List<String> head11 = new ArrayList<String>();
- head11.add("*房屋状态(自住/租住/其他)");
+ head11.add("房屋状态(自住/租住/其他)");
List<String> head12 = new ArrayList<String>();
- head12.add("*房屋用途(住宅/公寓/宿舍/仓库/其他）");
+ head12.add("房屋用途(住宅/公寓/宿舍/仓库/其他）");
List<String> head13 = new ArrayList<String>();
- head13.add("*管控状态(常规/关注/管控)");
+ head13.add("管控状态(常规/关注/管控)");
List<String> head14 = new ArrayList<String>();
head14.add("本地/外地");
List<String> head15 = new ArrayList<String>();
@@ -1246,19 +1266,19 @@
List<String> head6 = new ArrayList<String>();
head6.add("*小区号（政府对于每个小区都有特定编号）");
List<String> head7 = new ArrayList<String>();
- head7.add("*楼排号");
+ head7.add("楼排号");
List<String> head8 = new ArrayList<String>();
- head8.add("*单元号");
+ head8.add("单元号");
List<String> head9 = new ArrayList<String>();
- head9.add("*户室（四位数表示。前两位楼层，后两位户号）");
+ head9.add("户室（四位数表示。前两位楼层，后两位户号）");
List<String> head10 = new ArrayList<String>();
- head10.add("*是否租住（自住/租住）");
+ head10.add("是否租住（是/否）");
List<String> head11 = new ArrayList<String>();
- head11.add("*房屋状态(自住/租住/其他)");
+ head11.add("房屋状态(自住/租住/其他)");
List<String> head12 = new ArrayList<String>();
- head12.add("*房屋用途(住宅/公寓/宿舍/仓库/其他）");
+ head12.add("房屋用途(住宅/公寓/宿舍/仓库/其他）");
List<String> head13 = new ArrayList<String>();
- head13.add("*管控状态(常规/关注/管控)");
+ head13.add("控状态(常规/关注/管控)");
List<String> head14 = new ArrayList<String>();
head14.add("本地/外地");
List<String> head15 = new ArrayList<String>();
@@ -1389,19 +1409,19 @@
List<String> head4 = new ArrayList<String>();
head4.add("*小区号（政府对于每个小区都有特定编号）");
List<String> head5 = new ArrayList<String>();
- head5.add("*楼排号");
+ head5.add("楼排号");
List<String> head6 = new ArrayList<String>();
- head6.add("*单元号");
+ head6.add("单元号");
List<String> head7 = new ArrayList<String>();
- head7.add("*户室（四位数表示。前两位楼层，后两位户号）");
+ head7.add("户室（四位数表示。前两位楼层，后两位户号）");
List<String> head8 = new ArrayList<String>();
- head8.add("*是否租住（自住/租住）");
+ head8.add("是否租住（是/否）");
List<String> head9 = new ArrayList<String>();
- head9.add("*房屋状态(自住/租住/其他)");
+ head9.add("房屋状态(自住/租住/其他)");
List<String> head10 = new ArrayList<String>();
- head10.add("*房屋用途(住宅/公寓/宿舍/仓库/其他）");
+ head10.add("房屋用途(住宅/公寓/宿舍/仓库/其他）");
List<String> head11 = new ArrayList<String>();
- head11.add("*管控状态(常规/关注/管控)");
+ head11.add("控状态(常规/关注/管控)");
List<String> head12 = new ArrayList<String>();
head12.add("本地/外地");
List<String> head13 = new ArrayList<String>();
@@ -1421,22 +1441,21 @@
List<String> head20 = new ArrayList<String>();
head20.add("监护人公民身份号码");
List<String> head21 = new ArrayList<String>();
- head11.add("监护人联系方式");
+ head21.add("监护人联系方式");
List<String> head22 = new ArrayList<String>();
- head12.add("监护人居住详址");
+ head22.add("监护人居住详址");
List<String> head23 = new ArrayList<String>();
- head13.add("帮扶人姓名");
+ head23.add("帮扶人姓名");
List<String> head24 = new ArrayList<String>();
- head14.add("帮扶人联系方式");
+ head24.add("帮扶人联系方式");
List<String> head25 = new ArrayList<String>();
- head15.add("帮扶手段");
+ head25.add("帮扶手段");
List<String> head26 = new ArrayList<String>();
- head16.add("帮扶情况");
+ head26.add("帮扶情况");
List<String> head27 = new ArrayList<String>();
- head17.add("是否违法犯罪");
+ head27.add("是否违法犯罪");
List<String> head28 = new ArrayList<String>();
- head18.add("违法犯罪情况");
- List<String> head29 = new ArrayList<String>();
+ head28.add("违法犯罪情况");
list.add(head0);
list.add(head1);
list.add(head2);
@@ -1466,7 +1485,6 @@
list.add(head26);
list.add(head27);
list.add(head28);
- list.add(head29);
return list;
}
@@ -1494,19 +1512,19 @@
List<String> head9 = new ArrayList<String>();
head9.add("*小区号（政府对于每个小区都有特定编号）");
List<String> head10 = new ArrayList<String>();
- head10.add("*楼排号");
+ head10.add("楼排号");
List<String> head11 = new ArrayList<String>();
- head11.add("*单元号");
+ head11.add("单元号");
List<String> head12 = new ArrayList<String>();
- head12.add("*户室（四位数表示。前两位楼层，后两位户号）");
+ head12.add("户室（四位数表示。前两位楼层，后两位户号）");
List<String> head13 = new ArrayList<String>();
- head13.add("*是否租住（自住/租住）");
+ head13.add("是否租住（是/否）");
List<String> head14 = new ArrayList<String>();
- head14.add("*房屋状态(自住/租住/其他)");
+ head14.add("房屋状态(自住/租住/其他)");
List<String> head15 = new ArrayList<String>();
- head15.add("*房屋用途(住宅/公寓/宿舍/仓库/其他）");
+ head15.add("房屋用途(住宅/公寓/宿舍/仓库/其他）");
List<String> head16 = new ArrayList<String>();
- head16.add("*管控状态(常规/关注/管控)");
+ head16.add("控状态(常规/关注/管控)");
List<String> head17 = new ArrayList<String>();
head17.add("本地/外地");
List<String> head18 = new ArrayList<String>();
@@ -1568,19 +1586,19 @@
List<String> head7 = new ArrayList<String>();
head7.add("*小区号（政府对于每个小区都有特定编号）");
List<String> head8 = new ArrayList<String>();
- head8.add("*楼排号");
+ head8.add("楼排号");
List<String> head9 = new ArrayList<String>();
- head9.add("*单元号");
+ head9.add("单元号");
List<String> head10 = new ArrayList<String>();
- head10.add("*户室（四位数表示。前两位楼层，后两位户号）");
+ head10.add("户室（四位数表示。前两位楼层，后两位户号）");
List<String> head11 = new ArrayList<String>();
- head11.add("*是否租住（自住/租住）");
+ head11.add("是否租住（是/否）");
List<String> head12 = new ArrayList<String>();
- head12.add("*房屋状态(自住/租住/其他)");
+ head12.add("房屋状态(自住/租住/其他)");
List<String> head13 = new ArrayList<String>();
- head13.add("*房屋用途(住宅/公寓/宿舍/仓库/其他）");
+ head13.add("房屋用途(住宅/公寓/宿舍/仓库/其他）");
List<String> head14 = new ArrayList<String>();
- head14.add("*管控状态(常规/关注/管控)");
+ head14.add("控状态(常规/关注/管控)");
List<String> head15 = new ArrayList<String>();
head15.add("本地/外地");
List<String> head16 = new ArrayList<String>();
@@ -1691,19 +1709,19 @@
List<String> head7 = new ArrayList<String>();
head7.add("*小区号（政府对于每个小区都有特定编号）");
List<String> head8 = new ArrayList<String>();
- head8.add("*楼排号");
+ head8.add("楼排号");
List<String> head9 = new ArrayList<String>();
- head9.add("*单元号");
+ head9.add("单元号");
List<String> head10 = new ArrayList<String>();
- head10.add("*户室（四位数表示。前两位楼层，后两位户号）");
+ head10.add("户室（四位数表示。前两位楼层，后两位户号）");
List<String> head11 = new ArrayList<String>();
- head11.add("*是否租住（自住/租住）");
+ head11.add("是否租住（是/否）");
List<String> head12 = new ArrayList<String>();
- head12.add("*房屋状态(自住/租住/其他)");
+ head12.add("房屋状态(自住/租住/其他)");
List<String> head13 = new ArrayList<String>();
- head13.add("*房屋用途(住宅/公寓/宿舍/仓库/其他）");
+ head13.add("房屋用途(住宅/公寓/宿舍/仓库/其他）");
List<String> head14 = new ArrayList<String>();
- head14.add("*管控状态(常规/关注/管控)");
+ head14.add("控状态(常规/关注/管控)");
List<String> head15 = new ArrayList<String>();
head15.add("本地/外地");
List<String> head16 = new ArrayList<String>();
@@ -1753,19 +1771,19 @@
List<String> head8 = new ArrayList<String>();
head8.add("*小区号（政府对于每个小区都有特定编号）");
List<String> head9 = new ArrayList<String>();
- head9.add("*楼排号");
+ head9.add("楼排号");
List<String> head10 = new ArrayList<String>();
- head10.add("*单元号");
+ head10.add("单元号");
List<String> head11 = new ArrayList<String>();
- head11.add("*户室（四位数表示。前两位楼层，后两位户号）");
+ head11.add("户室（四位数表示。前两位楼层，后两位户号）");
List<String> head12 = new ArrayList<String>();
- head12.add("*是否租住（自住/租住）");
+ head12.add("是否租住（是/否）");
List<String> head13 = new ArrayList<String>();
- head13.add("*房屋状态(自住/租住/其他)");
+ head13.add("房屋状态(自住/租住/其他)");
List<String> head14 = new ArrayList<String>();
- head14.add("*房屋用途(住宅/公寓/宿舍/仓库/其他）");
+ head14.add("房屋用途(住宅/公寓/宿舍/仓库/其他）");
List<String> head15 = new ArrayList<String>();
- head15.add("*管控状态(常规/关注/管控)");
+ head15.add("控状态(常规/关注/管控)");
List<String> head16 = new ArrayList<String>();
head16.add("本地/外地");
List<String> head17 = new ArrayList<String>();
@@ -1812,13 +1830,13 @@
List<String> head0 = new ArrayList<String>();
head0.add("序号");
List<String> head1 = new ArrayList<String>();
- head1.add("*人员状态");
+ head1.add("人员状态");
List<String> head2 = new ArrayList<String>();
head2.add("机构");
List<String> head3 = new ArrayList<String>();
- head3.add("姓名");
+ head3.add("*姓名");
List<String> head4 = new ArrayList<String>();
- head4.add("身份证号码");
+ head4.add("*身份证号码");
List<String> head5 = new ArrayList<String>();
head5.add("联系电话");
List<String> head6 = new ArrayList<String>();
@@ -1834,19 +1852,19 @@
List<String> head11 = new ArrayList<String>();
head11.add("*小区号（政府对于每个小区都有特定编号）");
List<String> head12 = new ArrayList<String>();
- head12.add("*楼排号");
+ head12.add("楼排号");
List<String> head13 = new ArrayList<String>();
- head13.add("*单元号");
+ head13.add("单元号");
List<String> head14 = new ArrayList<String>();
- head14.add("*户室（四位数表示。前两位楼层，后两位户号）");
+ head14.add("户室（四位数表示。前两位楼层，后两位户号）");
List<String> head15 = new ArrayList<String>();
- head15.add("*是否租住（自住/租住）");
+ head15.add("是否租住（是/否）");
List<String> head16 = new ArrayList<String>();
- head16.add("*房屋状态(自住/租住/其他)");
+ head16.add("房屋状态(自住/租住/其他)");
List<String> head17 = new ArrayList<String>();
- head17.add("*房屋用途(住宅/公寓/宿舍/仓库/其他）");
+ head17.add("房屋用途(住宅/公寓/宿舍/仓库/其他）");
List<String> head18 = new ArrayList<String>();
- head18.add("*管控状态(常规/关注/管控)");
+ head18.add("控状态(常规/关注/管控)");
List<String> head19 = new ArrayList<String>();
head19.add("入伍时间");
List<String> head20 = new ArrayList<String>();
@@ -2024,19 +2042,19 @@
List<String> head10 = new ArrayList<String>();
head10.add("*小区号（政府对于每个小区都有特定编号）");
List<String> head11 = new ArrayList<String>();
- head11.add("*楼排号");
+ head11.add("楼排号");
List<String> head12 = new ArrayList<String>();
- head12.add("*单元号");
+ head12.add("单元号");
List<String> head13 = new ArrayList<String>();
- head13.add("*户室（四位数表示。前两位楼层，后两位户号）");
+ head13.add("户室（四位数表示。前两位楼层，后两位户号）");
List<String> head14 = new ArrayList<String>();
- head14.add("*是否租住（自住/租住）");
+ head14.add("是否租住（是/否）");
List<String> head15 = new ArrayList<String>();
- head15.add("*房屋状态(自住/租住/其他)");
+ head15.add("房屋状态(自住/租住/其他)");
List<String> head16 = new ArrayList<String>();
- head16.add("*房屋用途(住宅/公寓/宿舍/仓库/其他）");
+ head16.add("房屋用途(住宅/公寓/宿舍/仓库/其他）");
List<String> head17 = new ArrayList<String>();
- head17.add("*管控状态(常规/关注/管控)");
+ head17.add("控状态(常规/关注/管控)");
List<String> head18 = new ArrayList<String>();
head18.add("本地/外地");
List<String> head19 = new ArrayList<String>();
@@ -2099,19 +2117,19 @@
List<String> head13 = new ArrayList<String>();
head13.add("*小区号（政府对于每个小区都有特定编号）");
List<String> head14 = new ArrayList<String>();
- head14.add("*楼排号");
+ head14.add("楼排号");
List<String> head15 = new ArrayList<String>();
- head15.add("*单元号");
+ head15.add("单元号");
List<String> head16 = new ArrayList<String>();
- head16.add("*户室（四位数表示。前两位楼层，后两位户号）");
+ head16.add("户室（四位数表示。前两位楼层，后两位户号）");
List<String> head17 = new ArrayList<String>();
- head17.add("*是否租住（自住/租住）");
+ head17.add("是否租住（是/否）");
List<String> head18 = new ArrayList<String>();
- head18.add("*房屋状态(自住/租住/其他)");
+ head18.add("房屋状态(自住/租住/其他)");
List<String> head19 = new ArrayList<String>();
- head19.add("*房屋用途(住宅/公寓/宿舍/仓库/其他）");
+ head19.add("房屋用途(住宅/公寓/宿舍/仓库/其他）");
List<String> head20 = new ArrayList<String>();
- head20.add("*管控状态(常规/关注/管控)");
+ head20.add("控状态(常规/关注/管控)");
List<String> head21 = new ArrayList<String>();
head21.add("本地/外地");
List<String> head22 = new ArrayList<String>();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
index 8dafd4a..b769e6a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -275,15 +275,15 @@
",(select count(id) from com_mng_population where act_id = #{communityId} and out_or_local = 2) as outTotal " +
",(select count(id) from com_mng_population where act_id = #{communityId} and label is not null) as specialTotal " +
",(select count(village_id) from com_mng_village where community_id = #{communityId}) as villageTotal " +
- ",(select count(id) from com_drug_population where community_id = #{communityId}) as drugTotal " +
- ",(select count(id) from com_correct_population where community_id = #{communityId}) as correctTotal " +
- ",(select count(id) from com_major_population where community_id = #{communityId}) as majorTotal " +
- ",(select count(id) from com_cult_population where community_id = #{communityId}) as cultTotal " +
- ",(select count(id) from com_rehabilitation_population where community_id = #{communityId}) as rehabilitationTotal " +
- ",(select count(id) from com_key_population where community_id = #{communityId}) as keyTotal " +
- ",(select count(id) from com_veterans_population where community_id = #{communityId}) as veteransTotal " +
- ",(select count(id) from com_disability_population where community_id = #{communityId}) as disabilityTotal" +
- ",(select count(id) from com_low_security_population where community_id = #{communityId}) as lowSecurityTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','吸毒人员','%')) as drugTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','社区矫正','%')) as correctTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','精神障碍患者','%')) as majorTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','邪教人员','%')) as cultTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','刑满释放','%')) as rehabilitationTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','重点人员','%')) as keyTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','退役军人','%')) as veteransTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','残疾人','%')) as disabilityTotal " +
+ ",(select count(id) from com_mng_population where act_id = #{communityId} and label LIKE CONCAT('%','低保户','%')) as lowSecurityTotal " +
" from com_mng_population as cmp where act_id = #{communityId}")
ComMngPopulationTotalVO getPopulationTotalByAdmin(@Param("communityId") Long communityId);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index 0eab426..394e152 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -244,84 +244,120 @@
}
//吸毒信息
- ComDrugPopulationVO comDrugPopulationVO = new ComDrugPopulationVO();
- ComDrugPopulationDO comDrugPopulationDO = comDrugPopulationDAO.selectOne(new QueryWrapper<ComDrugPopulationDO>().
+ List<ComDrugPopulationVO> comDrugPopulationVOs = new ArrayList<>();
+ List<ComDrugPopulationDO> comDrugPopulationDOs = comDrugPopulationDAO.selectList(new QueryWrapper<ComDrugPopulationDO>().
lambda().eq(ComDrugPopulationDO::getPopulationId, populationId));
- if (null != comDrugPopulationDO) {
- BeanUtils.copyProperties(comDrugPopulationDO, comDrugPopulationVO);
- comMngPopulationVO.setComDrugPopulationVO(comDrugPopulationVO);
+ if (!comDrugPopulationDOs.isEmpty()) {
+ comDrugPopulationDOs.forEach(comDrugPopulationDO -> {
+ ComDrugPopulationVO comDrugPopulationVO = new ComDrugPopulationVO();
+ BeanUtils.copyProperties(comDrugPopulationDO, comDrugPopulationVO);
+ comDrugPopulationVOs.add(comDrugPopulationVO);
+ comMngPopulationVO.setComDrugPopulationVOs(comDrugPopulationVOs);
+ });
}
//社区矫正信息
- ComCorrectPopulationVO comCorrectPopulationVO = new ComCorrectPopulationVO();
- ComCorrectPopulationDO comCorrectPopulationDO = comCorrectPopulationDAO.selectOne(new QueryWrapper<ComCorrectPopulationDO>().
+ List<ComCorrectPopulationVO> comCorrectPopulationVOS = new ArrayList<>();
+ List<ComCorrectPopulationDO> comCorrectPopulationDOS = comCorrectPopulationDAO.selectList(new QueryWrapper<ComCorrectPopulationDO>().
lambda().eq(ComCorrectPopulationDO::getPopulationId, populationId));
- if (null != comCorrectPopulationDO) {
- BeanUtils.copyProperties(comCorrectPopulationDO, comCorrectPopulationVO);
- comMngPopulationVO.setComCorrectPopulationVO(comCorrectPopulationVO);
+ if (!comCorrectPopulationDOS.isEmpty()) {
+ comCorrectPopulationDOS.forEach(comCorrectPopulationDO -> {
+ ComCorrectPopulationVO comCorrectPopulationVO = new ComCorrectPopulationVO();
+ BeanUtils.copyProperties(comCorrectPopulationDO, comCorrectPopulationVO);
+ comCorrectPopulationVOS.add(comCorrectPopulationVO);
+ comMngPopulationVO.setComCorrectPopulationVOs(comCorrectPopulationVOS);
+ });
}
//精神障碍信息
- ComMajorPopulationVO comMajorPopulationVO = new ComMajorPopulationVO();
- ComMajorPopulationDO comMajorPopulationDO = comMajorPopulationDAO.selectOne(new QueryWrapper<ComMajorPopulationDO>().
+ List<ComMajorPopulationVO> comMajorPopulationVOS = new ArrayList<>();
+ List<ComMajorPopulationDO> comMajorPopulationDOs = comMajorPopulationDAO.selectList(new QueryWrapper<ComMajorPopulationDO>().
lambda().eq(ComMajorPopulationDO::getPopulationId, populationId));
- if (null != comMajorPopulationDO) {
- BeanUtils.copyProperties(comMajorPopulationDO, comMajorPopulationVO);
- comMngPopulationVO.setComMajorPopulationVO(comMajorPopulationVO);
+ if (!comMajorPopulationDOs.isEmpty()) {
+ comMajorPopulationDOs.forEach(comMajorPopulationDO -> {
+ ComMajorPopulationVO comMajorPopulationVO = new ComMajorPopulationVO();
+ BeanUtils.copyProperties(comMajorPopulationDO, comMajorPopulationVO);
+ comMajorPopulationVOS.add(comMajorPopulationVO);
+ comMngPopulationVO.setComMajorPopulationVOs(comMajorPopulationVOS);
+ });
}
//邪教信息
- ComCultPopulationVO comCultPopulationVO = new ComCultPopulationVO();
- ComCultPopulationDO comCultPopulationDO = comCultPopulationDAO.selectOne(new QueryWrapper<ComCultPopulationDO>().
+ List<ComCultPopulationVO> comCultPopulationVOS = new ArrayList<>();
+ List<ComCultPopulationDO> comCultPopulationDOS = comCultPopulationDAO.selectList(new QueryWrapper<ComCultPopulationDO>().
lambda().eq(ComCultPopulationDO::getPopulationId, populationId));
- if (null != comCultPopulationDO) {
- BeanUtils.copyProperties(comCultPopulationDO, comCultPopulationVO);
- comMngPopulationVO.setComCultPopulationVO(comCultPopulationVO);
+ if (!comCultPopulationDOS.isEmpty()) {
+ comCultPopulationDOS.forEach(comCultPopulationDO -> {
+ ComCultPopulationVO comCultPopulationVO = new ComCultPopulationVO();
+ BeanUtils.copyProperties(comCultPopulationDO, comCultPopulationVO);
+ comCultPopulationVOS.add(comCultPopulationVO);
+ comMngPopulationVO.setComCultPopulationVOs(comCultPopulationVOS);
+ });
}
//刑释信息
- ComRehabilitationPopulationVO comRehabilitationPopulationVO = new ComRehabilitationPopulationVO();
- ComRehabilitationPopulationDO comRehabilitationPopulationDO = comRehabilitationPopulationDAO.selectOne(new QueryWrapper<ComRehabilitationPopulationDO>().
+ List<ComRehabilitationPopulationVO> comRehabilitationPopulationVOS = new ArrayList<>();
+ List<ComRehabilitationPopulationDO> comRehabilitationPopulationDOS = comRehabilitationPopulationDAO.selectList(new QueryWrapper<ComRehabilitationPopulationDO>().
lambda().eq(ComRehabilitationPopulationDO::getPopulationId, populationId));
- if (null != comRehabilitationPopulationDO) {
- BeanUtils.copyProperties(comRehabilitationPopulationDO, comRehabilitationPopulationVO);
- comMngPopulationVO.setComRehabilitationPopulationVO(comRehabilitationPopulationVO);
+ if (!comRehabilitationPopulationDOS.isEmpty()) {
+ comRehabilitationPopulationDOS.forEach(comRehabilitationPopulationDO -> {
+ ComRehabilitationPopulationVO comRehabilitationPopulationVO = new ComRehabilitationPopulationVO();
+ BeanUtils.copyProperties(comRehabilitationPopulationDO, comRehabilitationPopulationVO);
+ comRehabilitationPopulationVOS.add(comRehabilitationPopulationVO);
+ comMngPopulationVO.setComRehabilitationPopulationVOs(comRehabilitationPopulationVOS);
+ });
}
//上访信息
- ComKeyPopulationVO comKeyPopulationVO = new ComKeyPopulationVO();
- ComKeyPopulationDO comKeyPopulationDO = comKeyPopulationDAO.selectOne(new QueryWrapper<ComKeyPopulationDO>().
+ List<ComKeyPopulationVO> comKeyPopulationVOS = new ArrayList<>();
+ List<ComKeyPopulationDO> comKeyPopulationDOS = comKeyPopulationDAO.selectList(new QueryWrapper<ComKeyPopulationDO>().
lambda().eq(ComKeyPopulationDO::getPopulationId, populationId));
- if (null != comKeyPopulationDO) {
- BeanUtils.copyProperties(comKeyPopulationDO, comKeyPopulationVO);
- comMngPopulationVO.setComKeyPopulationVO(comKeyPopulationVO);
+ if (!comKeyPopulationDOS.isEmpty()) {
+ comKeyPopulationDOS.forEach(comKeyPopulationDO -> {
+ ComKeyPopulationVO comKeyPopulationVO = new ComKeyPopulationVO();
+ BeanUtils.copyProperties(comKeyPopulationDO, comKeyPopulationVO);
+ comKeyPopulationVOS.add(comKeyPopulationVO);
+ comMngPopulationVO.setComKeyPopulationVOs(comKeyPopulationVOS);
+ });
}
//退役军人信息
- ComVeteransPopulationVO comVeteransPopulationVO = new ComVeteransPopulationVO();
- ComVeteransPopulationDO comVeteransPopulationDO = comVeteransPopulationDAO.selectOne(new QueryWrapper<ComVeteransPopulationDO>().
+ List<ComVeteransPopulationVO> comVeteransPopulationVOS = new ArrayList<>();
+ List<ComVeteransPopulationDO> comVeteransPopulationDOS = comVeteransPopulationDAO.selectList(new QueryWrapper<ComVeteransPopulationDO>().
lambda().eq(ComVeteransPopulationDO::getPopulationId, populationId));
- if (null != comRehabilitationPopulationDO) {
- BeanUtils.copyProperties(comVeteransPopulationDO, comVeteransPopulationVO);
- comMngPopulationVO.setComVeteransPopulationVO(comVeteransPopulationVO);
+ if (!comVeteransPopulationDOS.isEmpty()) {
+ comVeteransPopulationDOS.forEach(comVeteransPopulationDO -> {
+ ComVeteransPopulationVO comVeteransPopulationVO = new ComVeteransPopulationVO();
+ BeanUtils.copyProperties(comVeteransPopulationDO, comVeteransPopulationVO);
+ comVeteransPopulationVOS.add(comVeteransPopulationVO);
+ comMngPopulationVO.setComVeteransPopulationVOs(comVeteransPopulationVOS);
+ });
}
//残疾人信息
- ComDisabilityPopulationVO comDisabilityPopulationVO = new ComDisabilityPopulationVO();
- ComDisabilityPopulationDO comDisabilityPopulationDO = comDisabilityPopulationDAO.selectOne(new QueryWrapper<ComDisabilityPopulationDO>().
+ List<ComDisabilityPopulationVO> comDisabilityPopulationVOS = new ArrayList<>();
+ List<ComDisabilityPopulationDO> comDisabilityPopulationDOS = comDisabilityPopulationDAO.selectList(new QueryWrapper<ComDisabilityPopulationDO>().
lambda().eq(ComDisabilityPopulationDO::getPopulationId, populationId));
- if (null != comRehabilitationPopulationDO) {
- BeanUtils.copyProperties(comDisabilityPopulationDO, comDisabilityPopulationVO);
- comMngPopulationVO.setComDisabilityPopulationVO(comDisabilityPopulationVO);
+ if (!comDisabilityPopulationDOS.isEmpty()) {
+ comDisabilityPopulationDOS.forEach(comDisabilityPopulationDO -> {
+ ComDisabilityPopulationVO comDisabilityPopulationVO = new ComDisabilityPopulationVO();
+ BeanUtils.copyProperties(comDisabilityPopulationDO, comDisabilityPopulationVO);
+ comDisabilityPopulationVOS.add(comDisabilityPopulationVO);
+ comMngPopulationVO.setComDisabilityPopulationVOs(comDisabilityPopulationVOS);
+ });
}
//低保户信息
- ComLowSecurityPopulationVO comLowSecurityPopulationVO = new ComLowSecurityPopulationVO();
- ComLowSecurityPopulationDO comLowSecurityPopulationDO = comLowSecurityPopulationDAO.selectOne(new QueryWrapper<ComLowSecurityPopulationDO>().
+ List<ComLowSecurityPopulationVO> comLowSecurityPopulationVOS = new ArrayList<>();
+ List<ComLowSecurityPopulationDO> comLowSecurityPopulationDOS = comLowSecurityPopulationDAO.selectList(new QueryWrapper<ComLowSecurityPopulationDO>().
lambda().eq(ComLowSecurityPopulationDO::getPopulationId, populationId));
- if (null != comRehabilitationPopulationDO) {
- BeanUtils.copyProperties(comLowSecurityPopulationDO, comLowSecurityPopulationVO);
- comMngPopulationVO.setComLowSecurityPopulationVO(comLowSecurityPopulationVO);
+ if (!comLowSecurityPopulationDOS.isEmpty()) {
+ comLowSecurityPopulationDOS.forEach(comLowSecurityPopulationDO -> {
+ ComLowSecurityPopulationVO comLowSecurityPopulationVO = new ComLowSecurityPopulationVO();
+ BeanUtils.copyProperties(comLowSecurityPopulationDO, comLowSecurityPopulationVO);
+ comLowSecurityPopulationVOS.add(comLowSecurityPopulationVO);
+ comMngPopulationVO.setComLowSecurityPopulationVOs(comLowSecurityPopulationVOS);
+ });
}
return R.ok(comMngPopulationVO);
}
--
Gitblit v1.7.1