修改bug

huanghongfa

2021-05-12 c1df61c6ed6744c93280353466c7b1e7d8cef583

修改bug

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

@@ -177,8 +177,13 @@
                if(oneData.get(16) != null){
                    vo.setWorkCompany(oneData.get(16));
                }
                if(oneData.get(17) != null){
                    vo.setOutOrLocal(oneData.get(17));
                String outOrLocal = oneData.get(17);
                if(StringUtils.isNotEmpty(outOrLocal)){
                    if(outOrLocal.equals(ComMngPopulationServeExcelVO.outOrLocal.bd)){
                        vo.setOutOrLocal(1);
                    }else if(outOrLocal.equals(ComMngPopulationServeExcelVO.outOrLocal.wd)){
                        vo.setOutOrLocal(2);
                    }
                }
                if(oneData.get(18) != null){
                    vo.setCensusRegister(oneData.get(18));

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java

@@ -66,7 +66,7 @@
    private String workCompany;

    @ExcelProperty(value = "外地or本地", index = 17)
    private String outOrLocal;
    private Integer outOrLocal;

    @ExcelProperty(value = "户口所在地", index = 18)
    private String censusRegister;
@@ -82,4 +82,12 @@
     */
    private List<String> userTagStr = Lists.newArrayList();

    /**
     * 外地or本地(1.本地  2.外地)
     */
    public interface outOrLocal{
        String bd = "本地";
        String wd = "外地";
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMngPopulationDO.java

@@ -86,9 +86,9 @@
    @EncryptDecryptField
    private String phone;
    /**
     * 外地or本地
     * 外地or本地（1.本地  2.外地）
     */
    private String outOrLocal;
    private Integer outOrLocal;
    /**
     * 户口所在地
     */
@@ -177,4 +177,12 @@
        int no = 13;
    }

    /**
     * 外地or本地（1.本地  2.外地）
     */
    public interface outOrLocal{
        int bd = 1;
        int wd = 2;
    }

}