实有人口导入bug修改、优化

tangxiaobao

2021-08-12 126ce0e45b9cd325f60ebe4876fb644955b2435d

实有人口导入bug修改、优化

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulIsRentEnum.java

New file
@@ -0,0 +1,42 @@
package com.panzhihua.common.enums;

import lombok.Getter;

/**
 * 是否状态
 * 
 * @author huanghongfa
 */
@Getter
public enum PopulIsRentEnum
{
    YES(1, "租住"), NO(0, "自住");

    private final Integer code;
    private final String name;

    PopulIsRentEnum(Integer code, String name)
    {
        this.code = code;
        this.name = name;
    }

    public static int getCodeByName(String name) {
        for (PopulIsRentEnum item : PopulIsRentEnum.values()) {
            if (item.name.equals(name)) {
                return item.getCode();
            }
        }
        return 0;
    }

    public static String getCnDescByName(Integer code) {
        for (PopulIsRentEnum item : PopulIsRentEnum.values()) {
            if (item.code.equals(code)) {
                return item.getName();
            }
        }
        return "否";
    }

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/enums/PopulRelationEnum.java

@@ -10,8 +10,8 @@
@Getter
public enum PopulRelationEnum
{
    relation01(01, "本人"),
    relation02(02, "户主"),
    relation01(1, "本人"),
    relation02(2, "户主"),
    relation10(10, "配偶"),
    relation11(11, "夫"),
    relation12(12, "妻"),

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

@@ -353,7 +353,7 @@
                            index++;
                            ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
                            setVeteransMistake(oneData, mistake);
                            mistake.setMistake("您填写的政治面貌有误");
                            mistake.setMistake("您填写的婚姻关系·有误");
                            mistakes.add(mistake);
                            continue;
                        }

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

@@ -1441,22 +1441,21 @@
        List<String> head20 = new ArrayList<String>();
        head20.add("监护人公民身份号码");
        List<String> head21 = new ArrayList<String>();
        head11.add("监护人联系方式");
        head21.add("监护人联系方式");
        List<String> head22 = new ArrayList<String>();
        head12.add("监护人居住详址");
        head22.add("监护人居住详址");
        List<String> head23 = new ArrayList<String>();
        head13.add("帮扶人姓名");
        head23.add("帮扶人姓名");
        List<String> head24 = new ArrayList<String>();
        head14.add("帮扶人联系方式");
        head24.add("帮扶人联系方式");
        List<String> head25 = new ArrayList<String>();
        head15.add("帮扶手段");
        head25.add("帮扶手段");
        List<String> head26 = new ArrayList<String>();
        head16.add("帮扶情况");
        head26.add("帮扶情况");
        List<String> head27 = new ArrayList<String>();
        head17.add("是否违法犯罪");
        head27.add("是否违法犯罪");
        List<String> head28 = new ArrayList<String>();
        head18.add("违法犯罪情况");
        List<String> head29 = new ArrayList<String>();
        head28.add("违法犯罪情况");
        list.add(head0);
        list.add(head1);
        list.add(head2);
@@ -1486,7 +1485,6 @@
        list.add(head26);
        list.add(head27);
        list.add(head28);
        list.add(head29);
        return list;
    }

@@ -1832,13 +1830,13 @@
        List<String> head0 = new ArrayList<String>();
        head0.add("序号");
        List<String> head1 = new ArrayList<String>();
        head1.add("*人员状态");
        head1.add("人员状态");
        List<String> head2 = new ArrayList<String>();
        head2.add("机构");
        List<String> head3 = new ArrayList<String>();
        head3.add("姓名");
        head3.add("*姓名");
        List<String> head4 = new ArrayList<String>();
        head4.add("身份证号码");
        head4.add("*身份证号码");
        List<String> head5 = new ArrayList<String>();
        head5.add("联系电话");
        List<String> head6 = new ArrayList<String>();