java/zhihuishenqu.git

			@@ -1,5 +1,6 @@
			package com.panzhihua.common.listen;

			import cn.hutool.core.date.DateUtil;
			import com.alibaba.excel.context.AnalysisContext;
			import com.alibaba.excel.event.AnalysisEventListener;
			import com.alibaba.fastjson.JSONArray;
			@@ -120,6 +121,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<ComMngPopulationCultExcelVO> voList = Lists.newArrayList();
			// List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
			ArrayList<ComMngPopulationCultMistakeExcelVO> mistakes = Lists.newArrayList();
			@@ -338,10 +340,16 @@
			vo.setBasicSituation(oneData.get(20).trim());
			}
			if(StringUtils.isNotEmpty(oneData.get(21))){
			vo.setRemark(oneData.get(21).trim());
			vo.setJoinCultDate(DateUtil.parse(oneData.get(21).trim(), parsePatterns));
			}
			if(StringUtils.isNotEmpty(oneData.get(22))){
			vo.setIsExternalPublicity(Integer.valueOf(oneData.get(22).trim()));
			}
			if(StringUtils.isNotEmpty(oneData.get(23))){
			vo.setRemark(oneData.get(23).trim());
			}
			vo.getUserTagStr().add("邪教人员");
			for (int i = 22; i < headSize; i++) {
			for (int i = 24; i < headSize; i++) {
			if (oneData.get(i) != null && oneData.get(i).equals("是")) {
			vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));
			}
			@@ -431,7 +439,9 @@
			vo.setCensusRegister(map.get(18));
			vo.setCultName(map.get(19));
			vo.setBasicSituation(map.get(20));
			vo.setRemark(map.get(21));
			vo.setJoinCultDate(map.get(21));
			vo.setIsExternalPublicity(map.get(22));
			vo.setRemark(map.get(23));
			}

			private String convertMarriage(String ma) {