Merge branch 'test' into 'master'

罗元桥

2021-08-05 37018ce6810f4855f43374f47cbd7b5e0d70d5a5

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

@@ -115,7 +115,7 @@
         */
        private void saveData() {
            R<List<BcDictionaryVO>> dictionaryR = communityService.listDictionaryByKey(BcDictionaryConstants.FAMILY);
            log.info("开始导入吸毒人员数据");
            log.info("开始导入重精人员数据");
            log.info("表格总数据：" + list.size());
            if (list.size() == 0) {
                throw new ServiceException("500", "导入数据为空！");
@@ -401,6 +401,7 @@
        }

    private void setMistake(Map<Integer, String> map, ComMngPopulationMajorMistakeExcelVO vo){
        vo.setSerialNumber(map.get(0));
        vo.setName(map.get(1));
        vo.setCardNo(map.get(2));
        vo.setRoad(map.get(3));