修复bug

huanghongfa

2021-03-31 2ebab0313cd4dfecbb6ee6f2dec6e50b9f573222

修复bug

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java

@@ -738,11 +738,6 @@
                try {
                    List<List<String>> list = new ArrayList<>();
                    list = dataFilling();
                    //模拟数据集合
                    List<List<Object>> dataList = new ArrayList<>();
                    List<Object> data = new ArrayList<>();
                    data = dataListFilling();

                    //查询当前社区标签列表
                    R tagsResult = userService.listTags(communityId);
                    if(Constants.SUCCESS.equals(tagsResult.getCode())){
@@ -752,10 +747,27 @@
                            List<String> head = new ArrayList<>();
                            head.add(TagsList.get(i));
                            list.add(head);
                            data.add("否");
                        }
                    }
                    List<List<Object>> dataList = new ArrayList<>();
                    List<Object> data = new ArrayList<>();
                    data.add("张三");
                    data.add("男");
                    data.add(25);
                    data.add("是");
                    data.add("樱花街");
                    data.add(115);
                    data.add("15栋");
                    data.add(10);
                    data.add(1001);
                    data.add("汉族");
                    data.add("群众");
                    data.add("513421199508187219");
                    data.add("13768548521");
                    data.add("中国");
                    data.add("阿里巴巴");
                    dataList.add(data);

                    EasyExcel.write(fileName).head(list).sheet("实有人口导入模板").doWrite(dataList);

                    File file = new File(fileName);
@@ -835,25 +847,5 @@
        list.add(head14);
        list.add(head15);
        return list;
    }

    private List<Object> dataListFilling(){
        List<Object> data = new ArrayList<>();
        data.add("张三");
        data.add("男");
        data.add(25);
        data.add("是");
        data.add("樱花街");
        data.add(115);
        data.add("15栋");
        data.add(10);
        data.add(1001);
        data.add("汉族");
        data.add("群众");
        data.add("513421199508187219");
        data.add("13768548521");
        data.add("中国");
        data.add("阿里巴巴");
        return data;
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java

@@ -115,7 +115,8 @@
            "cmv.alley,\n" +
            "cmp.native_place,\n" +
            "cmp.nation, \n" +
            "cmp.label \n" +
            "cmp.label, \n" +
            "cmp.is_rent \n" +
            "FROM \n" +
            "com_mng_population AS cmp " +
            "LEFT JOIN com_mng_village AS cmv ON cmv.village_id = cmp.village_id " +