From 929ff93a7a9db5b9fb0e3ce8e45a66ce59ea1767 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 11 八月 2021 17:53:57 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java | 151 ++++++++++++++++++++++++++------------------------
1 files changed, 79 insertions(+), 72 deletions(-)
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 514242d..2932f12 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
@@ -1,5 +1,6 @@
package com.panzhihua.common.listen;
+import cn.hutool.core.date.DateUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.context.AnalysisContext;
@@ -133,6 +134,7 @@
int index = 2;
try {
+ String[] parsePatterns = new String[]{"yyyy-MM-dd", "yyyy-M-dd", "yyyy-MM-d", "yyyy-M-d", "yyyy/MM/dd", "yyyy/M/dd", "yyyy/MM/d", "yyyy/M/d"};
ArrayList<ComMngPopulationDrugExcelVO> voList = Lists.newArrayList();
// List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
ArrayList<ComMngPopulationDrugMistakeExcelVO> mistakes = Lists.newArrayList();
@@ -214,33 +216,39 @@
continue;
}
vo.setDoorNo(oneData.get(6).trim());
- if(StringUtils.isEmpty(oneData.get(7))){
- index++;
- ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
- setDrugMistake(oneData, mistake);
- mistake.setMistake("楼排号不可为空");
- mistakes.add(mistake);
- continue;
+// if(StringUtils.isEmpty(oneData.get(7))){
+// index++;
+// ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+// setDrugMistake(oneData, mistake);
+// mistake.setMistake("楼排号不可为空");
+// mistakes.add(mistake);
+// continue;
+// }
+ if(StringUtils.isNotEmpty(oneData.get(7))) {
+ vo.setFloor(oneData.get(7).trim());
}
- vo.setFloor(oneData.get(7).trim());
- if(StringUtils.isEmpty(oneData.get(8))){
- index++;
- ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
- setDrugMistake(oneData, mistake);
- mistake.setMistake("单元号不可为空");
- mistakes.add(mistake);
- continue;
+// if(StringUtils.isEmpty(oneData.get(8))){
+// index++;
+// ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+// setDrugMistake(oneData, mistake);
+// mistake.setMistake("单元号不可为空");
+// mistakes.add(mistake);
+// continue;
+// }
+ if(StringUtils.isNotEmpty(oneData.get(8))) {
+ vo.setUnitNo(oneData.get(8).trim());
}
- vo.setUnitNo(oneData.get(8).trim());
- if(StringUtils.isEmpty(oneData.get(9))){
- index++;
- ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
- setDrugMistake(oneData, mistake);
- mistake.setMistake("户室不可为空");
- mistakes.add(mistake);
- continue;
+// if(StringUtils.isEmpty(oneData.get(9))){
+// index++;
+// ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO();
+// setDrugMistake(oneData, mistake);
+// mistake.setMistake("户室不可为空");
+// mistakes.add(mistake);
+// continue;
+// }
+ if(StringUtils.isNotEmpty(oneData.get(9))) {
+ vo.setHouseNo(oneData.get(9).trim());
}
- vo.setHouseNo(oneData.get(9).trim());
if(StringUtils.isNotEmpty(oneData.get(10))){
Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(10));
if(isOk.equals(-1)){
@@ -309,10 +317,43 @@
vo.setCensusRegister(oneData.get(15).trim());
}
if(StringUtils.isNotEmpty(oneData.get(16))){
- vo.setRemark(oneData.get(16).trim());
+ vo.setFirstDate(DateUtil.parse(oneData.get(16).trim(), parsePatterns));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(17))){
+ vo.setControlSituation(oneData.get(17).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(18))){
+ vo.setControlPerson(oneData.get(18).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(19))){
+ vo.setControlPersonPhone(oneData.get(19).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(20))){
+ vo.setHelpSituation(oneData.get(20).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(21))){
+ vo.setHelpPerson(oneData.get(21).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(22))){
+ vo.setHelpPersonPhone(oneData.get(22).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(23))){
+ vo.setDrugReason(oneData.get(23).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(24))){
+ vo.setDrugResult(oneData.get(24).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(25))){
+ vo.setHaveCrime(oneData.get(25).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(26))){
+ vo.setCrimeSutiation(oneData.get(26).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(27))){
+ vo.setRemark(oneData.get(27).trim());
}
vo.getUserTagStr().add("吸毒人员");
- for (int i = 17; i < headSize; i++) {
+ for (int i = 28; i < headSize; i++) {
if (oneData.get(i) != null && oneData.get(i).equals("是")) {
vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));
}
@@ -380,51 +421,6 @@
}
}
- private void setMistake(Map<Integer, String> map, ComMngPopulationMistakeExcelVO vo){
- vo.setName(map.get(0));
- vo.setCardNo(map.get(1));
- vo.setNation(map.get(2));
- vo.setPoliticalOutlook(map.get(3));
- vo.setIsRent(map.get(4));
- vo.setRelation(map.get(5));
- vo.setRoad(map.get(6));
- vo.setDoorNo(map.get(7));
- vo.setFloor(map.get(8));
- vo.setUnitNo(map.get(9));
- vo.setHouseNo(map.get(10));
- vo.setBuildPurpose(map.get(11));
- vo.setBuildArea(map.get(12));
- vo.setHouseStatus(map.get(13));
- vo.setHousePurpose(map.get(14));
- vo.setControlStatus(map.get(15));
- vo.setPhone(map.get(16));
- vo.setNativePlace(map.get(17));
- vo.setCultureLevel(map.get(18));
- vo.setMarriage(map.get(19));
- vo.setHealthy(map.get(20));
- vo.setBloodType(map.get(21));
- vo.setReligion(map.get(22));
- vo.setProfession(map.get(23));
- vo.setWorkCompany(map.get(24));
- vo.setOutOrLocal(map.get(25));
- vo.setCensusRegister(map.get(26));
- vo.setResidence(map.get(27));
-// vo.setAddress(map.get(28));
- vo.setPersonType(map.get(28));
- vo.setCountry(map.get(29));
- vo.setStringOfDeparture(map.get(30));
- vo.setPersonStatus(map.get(31));
- vo.setMonthlyIncome(map.get(32));
- vo.setFamilyStatus(map.get(33));
- vo.setGoalInChina(map.get(34));
- vo.setStringOfArrival(map.get(35));
- vo.setRemark(map.get(36));
- vo.setIdCardPositive(map.get(37));
- vo.setIdCardBack(map.get(38));
- vo.setHouseHold(map.get(39));
- vo.setDeath(map.get(40));
- }
-
private void setDrugMistake(Map<Integer, String> map, ComMngPopulationDrugMistakeExcelVO vo){
vo.setSerialNumber(map.get(0));
vo.setName(map.get(1));
@@ -442,7 +438,18 @@
vo.setControlStatus(map.get(13));
vo.setOutOrLocal(map.get(14));
vo.setCensusRegister(map.get(15));
- vo.setRemark(map.get(16));
+ vo.setFirstDate(map.get(16));
+ vo.setControlSituation(map.get(17));
+ vo.setControlPerson(map.get(18));
+ vo.setControlPersonPhone(map.get(19));
+ vo.setHelpSituation(map.get(20));
+ vo.setHelpPerson(map.get(21));
+ vo.setHelpPersonPhone(map.get(22));
+ vo.setDrugReason(map.get(23));
+ vo.setDrugResult(map.get(24));
+ vo.setHaveCrime(map.get(25));
+ vo.setCrimeSutiation(map.get(26));
+ vo.setRemark(map.get(27));
}
private R mistakeExportPopulation(List<ComMngPopulationMistakeExcelVO> vo) {
--
Gitblit v1.7.1