修改bug

huanghongfa

2021-03-31 5ab3e73c4025fe18548fb035f112aa76183dc829

修改bug

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

@@ -95,7 +95,7 @@
                vo.setNativePlace(oneData.get(13));
                vo.setWorkCompany(oneData.get(14));
                for (int i = 15; i < headSize; i++) {
                    if (oneData.get(i).equals("是")) {
                    if (oneData.get(i) != null && oneData.get(i).equals("是")) {
                        vo.getUserTagStr().add(headData.get(i));
                    }
                }

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

@@ -737,7 +737,11 @@
                InputStream inputStream = null;
                try {
                    List<List<String>> list = new ArrayList<>();
                    list = dataFilling();
                    list = headDataFilling();
                    List<List<Object>> dataList = new ArrayList<>();
                    List<Object> data = new ArrayList<>();
                    data = formDataFilling();

                    //查询当前社区标签列表
                    R tagsResult = userService.listTags(communityId);
                    if(Constants.SUCCESS.equals(tagsResult.getCode())){
@@ -747,27 +751,10 @@
                            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);
@@ -799,7 +786,7 @@
        return communityService.deletePopulations(Ids);
    }

    private List<List<String>> dataFilling(){
    private List<List<String>> headDataFilling(){
        List<List<String>> list = new ArrayList<List<String>>();
        List<String> head0 = new ArrayList<String>();
        head0.add("家庭成员");
@@ -822,7 +809,7 @@
        List<String> head10 = new ArrayList<String>();
        head10.add("民族");
        List<String> head11 = new ArrayList<String>();
        head11.add("政治面貌");
        head11.add("政治面貌(群众/中共党员/共青团员)");
        List<String> head12 = new ArrayList<String>();
        head12.add("身份证");
        List<String> head13 = new ArrayList<String>();
@@ -848,4 +835,24 @@
        list.add(head15);
        return list;
    }

    private List<Object> formDataFilling(){
        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;
    }
}