Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-21 4e8338d3e2b30e360f028c9f2354462ca817a989

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationConfirmServeExcelListen.java

@@ -303,7 +303,16 @@
                    vo.setNativePlace(oneData.get(17).trim());
                }
                if (StringUtils.isNotEmpty(oneData.get(18))) {
                    vo.setCultureLevel(PopulCultureLevelEnum.getCodeByName(oneData.get(18)));
                    Integer isOk = PopulCultureLevelEnum.getCodeByName(oneData.get(18));
                    if (isOk.equals(-1)) {
                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                        importErrorVO.setErrorPosition("第" + index + "行，第19列");
                        importErrorVO.setErrorMsg("您填写的文化程度有误");
                        populationImportErrorVOList.add(importErrorVO);
                        index++;
                        continue;
                    }
                    vo.setCultureLevel(isOk);
                }
                if (StringUtils.isNotEmpty(oneData.get(19))) {
//                    String ma = convertMarriage(oneData.get(19));
@@ -358,10 +367,7 @@
                    vo.setResidence(PopulIsOkEnum.getCodeByName(oneData.get(27).trim()));
                }
                if (StringUtils.isNotEmpty(oneData.get(28))) {
                    vo.setAddress(oneData.get(28).trim());
                }
                if (StringUtils.isNotEmpty(oneData.get(29))) {
                    Integer isOk = PopulPersonTypeEnum.getCodeByName(oneData.get(29));
                    Integer isOk = PopulPersonTypeEnum.getCodeByName(oneData.get(28));
                    if (isOk.equals(-1)) {
                        ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
                        importErrorVO.setErrorPosition("第" + index + "行，第30列");
@@ -372,48 +378,48 @@
                    }
                    vo.setPersonType(isOk);
                }
                if (StringUtils.isNotEmpty(oneData.get(29))) {
                    vo.setCountry(oneData.get(29).trim());
                }
                if (StringUtils.isNotEmpty(oneData.get(30))) {
                    vo.setCountry(oneData.get(30).trim());
                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYY-dd-MM HH:mm:ss");
                    vo.setDateOfDeparture(simpleDateFormat.parse(oneData.get(30)));
                }
                if (StringUtils.isNotEmpty(oneData.get(31))) {
                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYY-dd-MM HH:mm:ss");
                    vo.setDateOfDeparture(simpleDateFormat.parse(oneData.get(31)));
                    vo.setPersonStatus(oneData.get(31).trim());
                }
                if (StringUtils.isNotEmpty(oneData.get(32))) {
                    vo.setPersonStatus(oneData.get(32).trim());
                    vo.setMonthlyIncome(oneData.get(32).trim());
                }
                if (StringUtils.isNotEmpty(oneData.get(33))) {
                    vo.setMonthlyIncome(oneData.get(33).trim());
                    vo.setFamilyStatus(oneData.get(33).trim());
                }
                if (StringUtils.isNotEmpty(oneData.get(34))) {
                    vo.setFamilyStatus(oneData.get(34).trim());
                    vo.setGoalInChina(oneData.get(34).trim());
                }
                if (StringUtils.isNotEmpty(oneData.get(35))) {
                    vo.setGoalInChina(oneData.get(35).trim());
                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYY-dd-MM HH:mm:ss");
                    vo.setDateOfArrival(simpleDateFormat.parse(oneData.get(35)));
                }
                if (StringUtils.isNotEmpty(oneData.get(36))) {
                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYY-dd-MM HH:mm:ss");
                    vo.setDateOfArrival(simpleDateFormat.parse(oneData.get(36)));
                }
                if (StringUtils.isNotEmpty(oneData.get(37))) {
                    vo.setRemark(oneData.get(37).trim());
                    vo.setRemark(oneData.get(36).trim());
                }

                if (StringUtils.isNotEmpty(oneData.get(37))) {
                    vo.setIdCardPositive(oneData.get(37).trim());
                }
                if (StringUtils.isNotEmpty(oneData.get(38))) {
                    vo.setIdCardPositive(oneData.get(38).trim());
                    vo.setIdCardBack(oneData.get(38).trim());
                }
                if (StringUtils.isNotEmpty(oneData.get(39))) {
                    vo.setIdCardBack(oneData.get(39).trim());
                    vo.setHouseHold(oneData.get(39).trim());
                }
                if (StringUtils.isNotEmpty(oneData.get(40))) {
                    vo.setHouseHold(oneData.get(40).trim());
                }
                if (StringUtils.isEmpty(oneData.get(41))) {
                if (StringUtils.isEmpty(oneData.get(40))) {
                    vo.setDeath(0);
                } else {
                    vo.setDeath(PopulIsOkEnum.getCodeByName(oneData.get(41).trim()));
                    vo.setDeath(PopulIsOkEnum.getCodeByName(oneData.get(40).trim()));
                }
                for (int i = 42; i < headSize; i++) {
                for (int i = 41; i < headSize; i++) {
                    if (oneData.get(i) != null && oneData.get(i).equals("是")) {
                        vo.getUserTagStr().add(headData.get(i).substring(0, headData.get(i).indexOf("(")));
                    }