社区后台基础数据库bug修改

tangxiaobao

2021-07-21 ca9ec1a1037ea4b7ee9a85be0c3f15d9ae40e792

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

@@ -5,20 +5,24 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.panzhihua.common.enums.PopulCultureLevelEnum;
import com.panzhihua.common.enums.PopulHouseUseEnum;
import com.panzhihua.common.enums.PopulIsOksEnum;
import com.panzhihua.common.enums.PopulMarriageEnum;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.enums.*;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationSubordinateDTO;
import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.vos.R;
@@ -29,16 +33,18 @@
import com.panzhihua.common.model.vos.community.screen.civil.CivilStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.*;
import com.panzhihua.common.model.vos.community.screen.event.EventTransferRecordVO;
import com.panzhihua.common.model.vos.community.screen.index.*;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
import com.panzhihua.common.model.vos.grid.EventResourceVO;
import com.panzhihua.common.model.vos.grid.PopulationDetailVO;
import com.panzhihua.common.model.vos.grid.PopulationListVO;
import com.panzhihua.common.model.vos.grid.*;
import com.panzhihua.common.model.vos.grid.admin.ComMngPopulationListVO;
import com.panzhihua.common.model.vos.grid.admin.ComMngPopulationVillageVO;
import com.panzhihua.common.model.vos.grid.admin.ComMngSubordinateVO;
import com.panzhihua.common.model.vos.grid.admin.excel.ComMngPopulationExportExcelVO;
import com.panzhihua.common.model.vos.screen.ComActPopulationCultureVO;
import com.panzhihua.common.model.vos.screen.ComActPopulationScreenVO;
import com.panzhihua.common.model.vos.screen.ComMngPopulationAgeVO;
import com.panzhihua.common.model.vos.user.*;
import com.panzhihua.common.model.vos.user.ComMngUserTagVO;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.common.utlis.Snowflake;
@@ -47,6 +53,7 @@
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.ComMngPopulationHouseUserService;
import com.panzhihua.service_community.service.ComMngPopulationService;
import com.panzhihua.service_community.service.ComMngVillageService;
import com.panzhihua.service_community.service.EventResourceService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
@@ -57,10 +64,7 @@

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -90,8 +94,11 @@
    private EventResourceService eventResourceService;
    @Resource
    private BigScreenDAO bigScreenDAO;
    @Resource
    private ComMngUserTagDAO comMngUserTagDAO;
    @Value("${domain.aesKey:}")
    private String aesKey;



    /**
@@ -174,6 +181,23 @@
//        if (!comMngFamilyInfoVOS.isEmpty()) {
//            comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
//        }
        //查询户主关系信息
        List<ComHouseMemberVo> comMngFamilyInfoVOS = populationDAO.listHouseMermberByPopuId(comMngPopulationDO.getId());
        if (!comMngFamilyInfoVOS.isEmpty()) {
            for (ComHouseMemberVo comHouseMemberVo : comMngFamilyInfoVOS){
                comHouseMemberVo.setAge(AgeUtils.getAgeFromBirthTimes(comHouseMemberVo.getBirthDay()));
            }
            comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
        }
        //设置户主关系
        List<ComMngPopulationHouseUserDO> comMngPopulationHouseUserDOS = comMngPopulationHouseUserDAO.selectList((new QueryWrapper<ComMngPopulationHouseUserDO>().lambda().eq(ComMngPopulationHouseUserDO::getPopulId, populationId)));
        if (!comMngPopulationHouseUserDOS.isEmpty()) {
            comMngPopulationVO.setRelation(comMngPopulationHouseUserDOS.get(comMngPopulationHouseUserDOS.size() - 1).getRelation());
        }
        //设置年龄
        if (StringUtils.isNotEmpty(comMngPopulationVO.getBirthday())) {
            comMngPopulationVO.setAge(AgeUtils.getAgeFromBirthTimes(comMngPopulationVO.getBirthday()));
        }

        //查询当前用户电子档信息
        if (!StringUtils.isEmpty(comMngPopulationDO.getCardNo())) {
@@ -261,14 +285,14 @@
        }

        if (StringUtils.isNotEmpty(comMngPopulationVO.getAgeStart())) {
            String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeStart()) + 1)), "yyyy-MM-dd");
            String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeStart()))), "yyyy-MM-dd");
            if (StringUtils.isNotEmpty(ageStartTime)) {
                comMngPopulationVO.setAgeStartTime(ageStartTime);
            }
        }

        if (StringUtils.isNotEmpty(comMngPopulationVO.getAgeEnd())) {
            String ageEndTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeEnd()) + 1)), "yyyy-MM-dd");
            String ageEndTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(), -(Integer.parseInt(comMngPopulationVO.getAgeEnd()))), "yyyy-MM-dd");
            if (StringUtils.isNotEmpty(ageEndTime)) {
                comMngPopulationVO.setAgeEndTime(ageEndTime);
            }
@@ -392,12 +416,13 @@
            if (populationDO == null) {
                //不存在实有人口,则新增
                populationDO = savePopulationDO(vo, comActDO, comMngVillageDO);
//                ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = savePopulationHouseUser(vo, populationDO, populationHouseDO);
            } else {
                //如果存在人口信息，且是自用房或是居住地，则更新人口默认的房屋信息
                if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) ||
                        (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
                    populationDO = updatePopulationDO(vo, populationDO);
                }
                //如果存在人口信息，且是自用房，则更新人口默认的房屋信息
//                if (vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) {
//                    populationDO = updatePopulationDO(vo, populationDO);
//                }
                populationDO = updatePopulationDO(vo, populationDO);
            }

            //处理实有人口房屋居住信息
@@ -433,15 +458,16 @@
        UpdateWrapper<ComMngPopulationDO> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("id",populationDO.getId());
        ComMngPopulationDO update = new ComMngPopulationDO();
        update.setRoad(vo.getRoad());
        update.setDoorNo(vo.getDoorNo());
        update.setFloor(vo.getFloor());
        update.setUnitNo(vo.getUnitNo());
        update.setHouseNo(vo.getHouseNo());
        update.setHouseId(vo.getHouseId());
        if (StringUtils.isNotEmpty(populationDO.getPhone())) {
            update.setPhone(populationDO.getPhone());
        }
//        update.setRoad(vo.getRoad());
//        update.setDoorNo(vo.getDoorNo());
//        update.setFloor(vo.getFloor());
//        update.setUnitNo(vo.getUnitNo());
//        update.setHouseNo(vo.getHouseNo());
//        update.setHouseId(vo.getHouseId());
//        if (StringUtils.isNotEmpty(populationDO.getPhone())) {
//            update.setPhone(populationDO.getPhone());
//        }
        BeanUtils.copyProperties(vo, update);
        this.baseMapper.update(update,updateWrapper);
        return populationDO;
    }
@@ -451,6 +477,19 @@
        BeanUtils.copyProperties(vo, populationDO);
        populationDO.setId(Snowflake.getId());
        List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList());
        //查询当前社区标签列表
        List<String> list = new ArrayList<>();
        List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", comActDO.getCommunityId()));
        if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
            list = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList());
        }
        //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除
        Iterator<String> iterator = userTag.iterator();
        while (iterator.hasNext()) {
            String s = iterator.next();
            if (!list.contains(s))
                iterator.remove();
        }
        populationDO.setVillageId(comMngVillageDO.getVillageId());
        populationDO.setActId(comActDO.getCommunityId());
        populationDO.setStreetId(comActDO.getStreetId());
@@ -509,6 +548,19 @@
        }
        comMngPopulationHouseDAO.insert(populationHouseDO);
        return populationHouseDO;
    }

    private ComMngPopulationHouseUserDO savePopulationHouseUser(ComMngPopulationServeExcelVO vo, ComMngPopulationDO comMngPopulationDO, ComMngPopulationHouseDO comMngPopulationHouseDO) {
        //查询该房屋未建立，执行建立房屋信息
        ComMngPopulationHouseUserDO populationHouseUserDO = new ComMngPopulationHouseUserDO();
        populationHouseUserDO.setId(Snowflake.getId());
        populationHouseUserDO.setPopulId(comMngPopulationDO.getId());
        populationHouseUserDO.setHouseId(comMngPopulationHouseDO.getId());
        populationHouseUserDO.setRelationId(comMngPopulationHouseDO.getStatus());
        populationHouseUserDO.setRelation(vo.getRelation());
        populationHouseUserDO.setCreateAt(new Date());
        comMngPopulationHouseUserDAO.insert(populationHouseUserDO);
        return populationHouseUserDO;
    }

    /**
@@ -665,6 +717,20 @@
    }

    @Override
    public R getPopulationListByVillageId(Long villageId) {
        List<ComMngPopulationDO> list = populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().eq("village_id", villageId));
        List<ComMngPopulationVO> resultList = new ArrayList<>();
        if (list.size() > 0) {
            list.forEach(populationDO -> {
                ComMngPopulationVO populationVO = new ComMngPopulationVO();
                BeanUtils.copyProperties(populationDO, populationVO);
                resultList.add(populationVO);
            });
        }
        return R.ok(resultList);
    }

    @Override
    public R editPopulation(ComMngPopulationEditDTO vo, Long communityId) throws Exception {
        ComMngPopulationDO populationDO = populationDAO.selectById(vo.getId());
        if (populationDO == null) {
@@ -708,6 +774,7 @@
        if (!vo.getHouseEditDTOList().isEmpty()) {
            for (ComMngPopulationHouseEditDTO houseEditDto : vo.getHouseEditDTOList()) {
                ComMngPopulationHouseUserDO populationHouseUserDO = new ComMngPopulationHouseUserDO();
                populationHouseUserDO.setId(Snowflake.getId());
                populationHouseUserDO.setPopulId(populationDO.getId());
                populationHouseUserDO.setHouseId(houseEditDto.getId());
                if (houseEditDto.getIsResidence().equals(ComMngPopulationHouseEditDTO.isResidence.yes)) {
@@ -740,7 +807,20 @@
                }
            }
        }
        populationDO.setUpdateAt(new Date());

        ComMngPopulationHouseUserDO comMngPopulationHouseUserDO = comMngPopulationHouseUserDAO.selectOne(new QueryWrapper<ComMngPopulationHouseUserDO>().lambda()
                .eq(ComMngPopulationHouseUserDO::getPopulId, vo.getId()));
        if (comMngPopulationHouseUserDO != null) {
            comMngPopulationHouseUserDO.setRelation(vo.getRelation());
            comMngPopulationHouseUserDAO.updateById(comMngPopulationHouseUserDO);
        }else {
            comMngPopulationHouseUserDO = new ComMngPopulationHouseUserDO();
            comMngPopulationHouseUserDO.setId(Snowflake.getId());
            comMngPopulationHouseUserDO.setPopulId(vo.getId());
            comMngPopulationHouseUserDO.setRelation(vo.getRelation());
            comMngPopulationHouseUserDO.setCreateAt(new Date());
            comMngPopulationHouseUserDAO.insert(comMngPopulationHouseUserDO);
        }
        if (populationDAO.updateById(populationDO) > 0) {
            return R.ok();
        } else {
@@ -774,6 +854,62 @@
        } else {
            return R.fail();
        }
    }

    @Override
    public R specialInputUserTags(PageInputUserDTO comMngUserTagDTO) {
        IPage<ComMngTagVO> iPage = populationDAO.specialInputUserTags(new Page<>(comMngUserTagDTO.getPageNum()
                , comMngUserTagDTO.getPageSize()), comMngUserTagDTO);
        return R.ok(iPage);
    }

    @Override
    public R saveSpecialInputUserTags(ComMngTagVO comMngTagVO) {
        if (null != comMngTagVO.getId() && comMngTagVO.getId() != 0) {
            //修改
            ComMngUserTagDO comMngUserTagDO = comMngUserTagDAO.selectById(comMngTagVO.getId());
            if (null == comMngUserTagDO) {
                return R.fail("该标签不存在");
            }
            ComMngUserTagDO checkCreditCode = comMngUserTagDAO.selectOne(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName()));
            if (null != checkCreditCode && comMngUserTagDO.getId() != checkCreditCode.getId()) {
                return R.fail("该标签已存在，标签名称重复");
            }

            BeanUtils.copyProperties(comMngTagVO, comMngUserTagDO);
            int update = comMngUserTagDAO.updateById(comMngUserTagDO);
            if (update > 0) {
                return R.ok();
            }
        } else {
            //新增
            Integer count = comMngUserTagDAO.selectCount(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getTagName, comMngTagVO.getTagName()));
            if (count > 0) {
                return R.fail("该标签已存在，标签名称重复");
            }
            ComMngUserTagDO comMngUserTagDO = new ComMngUserTagDO();
            BeanUtils.copyProperties(comMngTagVO, comMngUserTagDO);
            int insert = comMngUserTagDAO.insert(comMngUserTagDO);
            if (insert > 0) {
                return R.ok();
            }
        }

        return R.fail("添加失败");
    }

    @Override
    public R deleteSpecialInputUserTags(Long id) {
        //查询特殊群体人员
        ComMngUserTagDO comMngUserTagDO = comMngUserTagDAO.selectById(id);
        if (comMngUserTagDO == null) {
            return R.fail("该标签不存在");
        }
        int delete = comMngUserTagDAO.deleteById(id);
        if (delete > 0) {
            return R.ok();
        }
        return R.fail("删除失败");
    }

    /**
@@ -1019,24 +1155,26 @@
    /**
     * 事件大屏统计接口
     *
     * @param communityId 社区id
     * @param screenEventDTO 请求参数
     * @return 统计结果
     */
    @Override
    public R getScreenEvent(Long communityId) {
    public R getScreenEvent(BigScreenEventDTO screenEventDTO) {

        Long communityId = screenEventDTO.getCommunityId();
        //创建统计返回参数
        EventStatisticsVO statisticsVO = new EventStatisticsVO();

        //查询页面左边数据
        EventLeftStatisticsVO leftStatisticsVO = new EventLeftStatisticsVO();
        //查询左上数据
        EventLeftTopStatisticsVO leftTopStatisticsVO = this.baseMapper.getEventScreenLeftTop(communityId);
        EventLeftTopStatisticsVO leftTopStatisticsVO = this.baseMapper.getEventScreenLeftTop(screenEventDTO);
        //查询时间频发月份
        List<Integer> monthList = this.baseMapper.getFrequentlyEventMonth(communityId);
        leftTopStatisticsVO.setOftenMonth(monthList);
        leftStatisticsVO.setLeftTopStatisticsVO(leftTopStatisticsVO);
        //查询左下数据
        EventLeftDownStatisticsVO leftDownStatisticsVO = this.baseMapper.getEventScreenLeftDown(communityId);
        EventLeftDownStatisticsVO leftDownStatisticsVO = this.baseMapper.getEventScreenLeftDown(screenEventDTO);
        leftStatisticsVO.setLeftDownStatisticsVO(leftDownStatisticsVO);
        statisticsVO.setLeftStatisticsVO(leftStatisticsVO);

@@ -1086,7 +1224,7 @@
        statisticsVO.setGridStatisticsList(gridStatisticsList);

        //查询社区事件列表
        List<EventGridIncidentStatisticsVO> gridIncidentList = this.baseMapper.getEventScreenEventList(communityId);
        List<EventGridIncidentStatisticsVO> gridIncidentList = this.baseMapper.getEventScreenEventList(screenEventDTO);
        statisticsVO.setGridIncidentList(gridIncidentList);

        //查询小区列表
@@ -1390,11 +1528,23 @@
        comActPopulationScreenVO.setAgeGroup(ageList);
    }

    /**
     * 获取社区网格
     *
     * @param communityId 社区id
     * @return 网格数据
     */
    @Override
    public R getScreenGirds(Long communityId) {
        return R.ok(this.baseMapper.getEventScreenGridData(communityId));
    }

    /**
     * 事件大屏查询事件详情
     *
     * @param eventDetailDTO 请求参数
     * @return 事件详情
     */
    @Override
    public R getScreenEventDetail(BigScreenEventDetailDTO eventDetailDTO) {
        EventNewStatisticsVO statisticsVO = new EventNewStatisticsVO();
@@ -1477,6 +1627,12 @@
        return R.ok(statisticsVO);
    }

    /**
     * 获取人口数据信息
     *
     * @param populationListDTO 请求参数
     * @return 人口数据
     */
    @Override
    public R pagePopulationListApp(PagePopulationListDTO populationListDTO){
        IPage<PopulationListVO> pagePopulationList = this.baseMapper.pagePopulationListApp(new Page(populationListDTO.getPageNum(),populationListDTO.getPageSize()),populationListDTO);
@@ -1488,6 +1644,12 @@
        return R.ok(pagePopulationList);
    }

    /**
     * 根据人口id获取人口详情
     *
     * @param populationId  人口id
     * @return  人口详情
     */
    @Override
    public R getPopulationDetailApp(Long populationId){
        PopulationDetailVO detail = this.baseMapper.getPopulationDetailApp(populationId);
@@ -1503,6 +1665,11 @@
        return R.ok(detail);
    }

    /**
     * 修复人口加密问题
     *
     * @return 修复结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R getPopulationRepairByApp(){
@@ -1520,6 +1687,11 @@
        return R.ok();
    }

    /**
     * 综治后台-居民列表
     * @param populationListDTO 请求参数
     * @return  居民列表
     */
    @Override
    public R getGridPopulationAdminList(ComMngPopulationListDTO populationListDTO){
        IPage<ComMngPopulationListVO> populationListIPage = this.baseMapper.getGridPopulationAdminList(new Page(populationListDTO.getPageNum(),populationListDTO.getPageSize()),populationListDTO);
@@ -1543,6 +1715,11 @@
        return R.ok(populationListIPage);
    }

    /**
     * 综治后台-删除居民
     * @param ids   居民id集合
     * @return  删除结果
     */
    @Override
    public R delGridPopulationAdmin(List<Long> ids){
        Integer count = this.baseMapper.getPopulationVisitingCount(ids);
@@ -1577,4 +1754,107 @@
        return R.ok();
    }

    /**
     * 查询平台人口列表
     * @param populationDTO 请求参数
     * @return  人口列表
     */
    @Override
    public R getBuildingHousePopulationList(PageComMngPopulationDTO populationDTO){

        IPage<EventSpecialPopulationVO> populationVOIPage = this.baseMapper.getBuildingHousePopulationList(new Page(populationDTO.getPageNum(),populationDTO.getPageSize()),populationDTO);
        if(!populationVOIPage.getRecords().isEmpty()){
            populationVOIPage.getRecords().forEach(population -> {
                try {
                    Integer age = IdcardUtil.getAgeByIdCard(population.getIdCard());
                    population.setAge(age);
                }catch (Exception e){
                    log.error("人员身份证转换年龄失败，人员id：" + population.getId());
                }
            });
        }
        return R.ok(populationVOIPage);
    }

    /**
     * 综治后台-居民标签栏统计
     * @return  居民统计
     */
    @Override
    public R getGridPopulationStatistics(Long communityId){
        return R.ok(this.baseMapper.getGridPopulationStatistics(communityId));
    }

    /**
     * 综治后台-居民导出查询居民数据
     * @param populationExportDTO   请求参数
     * @return  导出结果
     */
    @Override
    public R getGridPopulationExport(ComMngPopulationExportDTO populationExportDTO){
        //结果集
        List<ComMngPopulationExportExcelVO> resultPopulationList = new ArrayList<>();
        //查询人口信息
        List<ComMngPopulationListVO> populationListVOList = this.baseMapper.getGridPopulationAdminLists(populationExportDTO);
        if(!populationListVOList.isEmpty()){
            populationListVOList.forEach(population -> {
                ComMngPopulationExportExcelVO populationExportExcelVO = new ComMngPopulationExportExcelVO();
                BeanUtils.copyProperties(population,populationExportExcelVO);
                if(population.getSex() != null){
                    populationExportExcelVO.setSex(PopulSexEnum.getCnDescByName(population.getSex()));
                }
                if(population.getPoliticalOutlook() != null){
                    populationExportExcelVO.setPoliticalOutlook(PopulPoliticalOutlookEnum.getCnDescByName(population.getPoliticalOutlook()));
                }
                if(population.getIsHouse() != null){
                    if(!population.getIsHouse().equals(0L)){
                        populationExportExcelVO.setIsHouse("是");
                    }else{
                        populationExportExcelVO.setIsHouse("否");
                    }
                }
                if(population.getEventStatus() != null){
                    populationExportExcelVO.setEventStatus(EventStatusEnum.getCnDescByName(population.getEventStatus()));
                }
                try {
                    Integer age = IdcardUtil.getAgeByIdCard(population.getCardNo());
                    populationExportExcelVO.setAge(age);
                }catch (Exception e){
                    log.error("当前人口身份证获取年龄失败，实有人口id：" + population.getId());
                }
                resultPopulationList.add(populationExportExcelVO);
            });
        }
        return R.ok(resultPopulationList);
    }

    /**
     * 综治后台-居民管理小区列表
     * @param name  小区名字
     * @return  小区列表
     */
    @Override
    public R relationVillage(String name){
        List<ComMngPopulationVillageVO> populationVillageList = new ArrayList<>();
        QueryWrapper<ComMngVillageDO> villageQuery = new QueryWrapper<>();
        if(StringUtils.isNotEmpty(name)){
            villageQuery.lambda().like(ComMngVillageDO::getName,name);
        }

        List<ComMngVillageDO> villageList = comActVillageDAO.selectList(villageQuery);
        if(!villageList.isEmpty()){
            villageList.forEach(village -> {
                ComMngPopulationVillageVO populationVillageVO = new ComMngPopulationVillageVO();
                BeanUtils.copyProperties(village,populationVillageVO);
                populationVillageList.add(populationVillageVO);
            });
        }
        return R.ok(populationVillageList);
    }

    @Override
    public R getVillagePopulationAdmin(PageComMngVillagePopulationDTO villagePopulationDTO){
        return R.ok(this.baseMapper.getVillagePopulationAdmin(new Page(villagePopulationDTO.getPageNum(),villagePopulationDTO.getPageSize()),villagePopulationDTO));
    }

}