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

huanghongfa

2021-07-05 2dcf4b9d75cc1b6613aea59cec4a0f9cc97f1c0e

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

@@ -332,7 +332,12 @@
                if(StringUtils.isNotEmpty(oneData.get(27))){
                    vo.setHouseHold(oneData.get(27).trim());
                }
                for (int i = 28; i < headSize; i++) {
                if(StringUtils.isEmpty(oneData.get(28))){
                    vo.setIsResidence(0);
                }else{
                    vo.setIsResidence(PopulIsOkEnum.getCodeByName(oneData.get(28).trim()));
                }
                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("(")));
                    }
@@ -377,6 +382,7 @@
                }
            }
        } catch (NumberFormatException e) {
            e.printStackTrace();
            List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
            ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
            importErrorVO.setErrorPosition("第" + index + "行");