Merge branch 'test' into 'master'

罗元桥

2021-06-30 2ca2e51f3a838252ed9cd8989f4f5d6fe35d468c

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

@@ -1,17 +1,23 @@
package com.panzhihua.service_community.service.impl;

import cn.hutool.core.util.IdcardUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseEditAdminDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngVillageBuildHouseAppDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngCascadeHouseVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationHouseDetailAdminVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationHouseTotalVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationHouseUserAdminVO;
import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingHouseDetailVO;
import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingHouseVO;
import com.panzhihua.common.model.vos.grid.PopulationListVO;
import com.panzhihua.service_community.dao.ComActVillageDAO;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.dao.ComMngPopulationHouseDAO;
@@ -246,4 +252,84 @@
        return R.ok(this.baseMapper.getRegion(communityId));
    }

    /**
     * 小区楼栋下房屋列表
     * @param buildHouseAppDTO  请求参数
     * @return  房屋列表
     */
    @Override
    public R getGridVillageBuildingHouseList(PageComMngVillageBuildHouseAppDTO buildHouseAppDTO){

        IPage<ComMngVillageBuildingHouseVO> buildingHouseVOIPage = this.baseMapper.getGridVillageBuildingHouseList(new Page(buildHouseAppDTO.getPageNum(),buildHouseAppDTO.getPageSize()),buildHouseAppDTO);
        if(!buildingHouseVOIPage.getRecords().isEmpty()){
            buildingHouseVOIPage.getRecords().forEach(house ->{
                boolean result=house.getHouseNo().matches("[0-9]+");
                if(result){//该字段为纯数字
                    if(house.getHouseNo().length() == 4){
                        house.setBuildingNum(house.getHouseNo().substring(0,2).replaceAll("^(0+)", ""));
                    }else if(house.getHouseNo().length() == 3){
                        house.setBuildingNum(house.getHouseNo().substring(0,1).replaceAll("^(0+)", ""));
                    }
                }else{
                    house.setBuildingNum("-");
                }
            });
        }
        return R.ok(buildingHouseVOIPage);
    }

    /**
     * 小区楼栋下房屋信息
     * @param houseId   房屋id
     * @return  房屋信息
     */
    @Override
    public R getGridVillageBuildingHouseDetail(Long houseId){

        ComMngVillageBuildingHouseDetailVO buildingHouseDetailVO = this.baseMapper.getGridVillageBuildingHouseDetail(houseId);
        if(buildingHouseDetailVO != null){

            //转换楼层数
            String houseNo = buildingHouseDetailVO.getHouseNo();
            boolean result = houseNo.matches("[0-9]+");
            if(result){//该字段为纯数字
                if(houseNo.length() == 4){
                    buildingHouseDetailVO.setBuildingNum(houseNo.substring(0,2).replaceAll("^(0+)", ""));
                }else if(houseNo.length() == 3){
                    buildingHouseDetailVO.setBuildingNum(houseNo.substring(0,1).replaceAll("^(0+)", ""));
                }
            }else{
                buildingHouseDetailVO.setBuildingNum("-");
            }

            //查询该房屋的户主信息
            List<PopulationListVO> householderList = this.baseMapper.getGridVillageBuildingPopulationList(buildingHouseDetailVO.getId(),1,null);
            if(!householderList.isEmpty()){
                householderList.forEach(householder -> {
                    try {
                        Integer age = IdcardUtil.getAgeByIdCard(householder.getCardNo());
                        householder.setAge(age);
                    }catch (Exception e){
                        log.error("身份证号码转换年龄失败，人员id：" + householder.getId());
                    }
                });
                buildingHouseDetailVO.setHouseholderList(householderList);
            }
            //查询该房屋的住户信息
            List<PopulationListVO> populationList = this.baseMapper.getGridVillageBuildingPopulationList(buildingHouseDetailVO.getId(),null,1);
            if(!populationList.isEmpty()){
                populationList.forEach(population -> {
                    try {
                        Integer age = IdcardUtil.getAgeByIdCard(population.getCardNo());
                        population.setAge(age);
                    }catch (Exception e){
                        log.error("身份证号码转换年龄失败，人员id：" + population.getId());
                    }
                });
                buildingHouseDetailVO.setPopulationList(populationList);
            }
        }
        return R.ok(buildingHouseDetailVO);
    }

}