实有人口相关修改

101captain

2022-01-18 be61b21abe54cf9d2c5c8a4945d41517238c4230

实有人口相关修改

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

@@ -192,6 +192,12 @@
    @ApiModelProperty("身份证无加密字段")
    private String cardNoStr;

    @ApiModelProperty("是否健在 0是 、1否")
    private Integer death;

    @ApiModelProperty("人员类型 1   80-89  2 90-99 3  100以上")
    private Integer type;

    @ApiModelProperty("房屋列表")
    private List<ComMngHouseVo> houseList;


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

@@ -99,7 +99,7 @@
        + "cmp.special_situation, " + "cmp.phone, " + "cmp.remark, " + "cmp.native_place, " + "cmp.nation,  "
        + "cmpct.label,  " + "cmp.marriage,  " + "cmp.culture_level,  " + "cmp.profession,  " + "cmp.out_or_local,  "
        + "cmp.census_register,  " + "cmp.healthy,  " + "cmp.birthday,  " + "cmp.update_at,  " + "cmp.address,  "
        + "cmp.is_rent  " + "FROM  " + "com_mng_population AS cmp "
        + "cmp.is_rent,cmp.death  " + "FROM  " + "com_mng_population AS cmp "
        + " LEFT JOIN com_mng_population_community_tags AS cmpct ON cmp.id = cmpct.population_id  " + "<where>"
        + "<if test='comMngPopulationVO.name != null and comMngPopulationVO.name != &quot;&quot;'>"
        + "AND cmp.`name` LIKE concat(#{comMngPopulationVO.name},'%') " + " </if> "

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

@@ -550,6 +550,15 @@
                    populDO.setPoliticalOutlookName(
                        PopulPoliticalOutlookEnum.getCnDescByName(populDO.getPoliticalOutlook()));
                    populDO.setMarriageName(PopulMarriageEnum.getCnDescByName(populDO.getMarriage()));
                    if(populDO.getAge()>=80&&populDO.getAge()<=89){
                        populDO.setType(1);
                    }
                    if(populDO.getAge()>=90&&populDO.getAge()<=99){
                        populDO.setType(2);
                    }
                    if(populDO.getAge()>=100){
                        populDO.setType(3);
                    }
                }
            });
        }