实有人口展示人员标签

puhanshu

2022-01-24 d87a39816ed3e483cbf58a37dc6aebfd2c29baa4

实有人口展示人员标签

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

@@ -2,6 +2,7 @@

import com.alibaba.excel.annotation.ExcelProperty;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@@ -54,4 +55,7 @@

    @ExcelProperty(value = "工作单位", index = 15)
    private String workCompany;

    @ExcelProperty(value = "人员类型", index = 16)
    private String personType;
}

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

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

    @ApiModelProperty("人员类型（1、户籍人口2、留守人员3、外地人员4、境外人员5、流动人口6、常住人口7、暂住人口）")
    private String personType;

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


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

@@ -2720,6 +2720,9 @@
                            if (StringUtils.isNotEmpty(popul.getBirthday())) {
                                populationExcelVo.setAge(AgeUtils.getAgeFromBirthTimes(popul.getBirthday()));
                            }
                            if (StringUtils.isNumeric(popul.getPersonType())) {
                                populationExcelVo.setPersonType(PopulPersonTypeEnum.getCnDescByName(Integer.parseInt(popul.getPersonType())));
                            }
                            populationExcelVoList.add(populationExcelVo);
                        }
                    }

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml

@@ -291,7 +291,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_community_tags as cmpct
        cmp.is_rent, cmp.person_type FROM com_mng_population_community_tags as cmpct
        LEFT JOIN com_mng_population AS cmp ON cmp.id = cmpct.population_id
        <where>
            <if test='comMngPopulationVO.name != null and comMngPopulationVO.name != &quot;&quot;'>