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

huanghongfa

2021-08-15 4ca86cb13b25ece24a323300294b0507926b37a2

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

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

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

@@ -118,7 +118,6 @@
//            dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
//        }


            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"};

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

@@ -119,7 +119,6 @@
//            dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
//        }


            int index = 2;
            try {
                ArrayList<ComMngPopulationDisabilityExcelVO> voList = Lists.newArrayList();

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

@@ -131,7 +131,6 @@
//            dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
//        }


            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"};

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

@@ -127,7 +127,6 @@
//            dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
//        }


            int index = 2;
            try {
                ArrayList<ComMngPopulationKeyExcelVO> voList = Lists.newArrayList();

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

@@ -120,7 +120,6 @@
//            dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
//        }


            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", "yyyy/MM", "yyyy/M", "yyyy-M", "yyyy-MM"};

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

@@ -127,7 +127,6 @@
//            dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
//        }


            int index = 2;
            try {
                ArrayList<ComMngPopulationMajorExcelVO> voList = Lists.newArrayList();

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

@@ -128,7 +128,6 @@
//            dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
//        }


            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"};

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

@@ -129,7 +129,6 @@
//            dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
//        }


            int index = 2;
            try {
                ArrayList<ComMngPopulationSentenceExcelVO> voList = Lists.newArrayList();

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

@@ -125,7 +125,6 @@
//            dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
//        }


            int index = 2;
            try {
                ArrayList<ComMngPopulationServeExcelVO> voList = Lists.newArrayList();

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

@@ -118,7 +118,6 @@
//            dictMap.put(vo.getDictName(),Integer.valueOf(vo.getDictValue()));
//        }


            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"};

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java

@@ -3074,6 +3074,7 @@
            comRehabilitationPopulationDO.setStreetId(populationDO.getStreetId());
            comRehabilitationPopulationDAO.insert(comRehabilitationPopulationDO);
        }

        return populationDO;
    }