12/23 大屏修改

101captain

2021-12-23 5a8a90c095280fbd2106869ecd2bad10e01a57a6

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

@@ -9,6 +9,7 @@
import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseInsertAdminDTO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.service.ComMngPopulationHouseUserService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -98,9 +99,8 @@
                cascadeHouseVOList = this.baseMapper.getHouseLevelByAlley(cascadeHouseDTO.getCommunityId(),
                    cascadeHouseDTO.getVillageId());
                cascadeHouseVOList = cascadeHouseVOList.stream()
                    .collect(Collectors.collectingAndThen(
                        Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley()))),
                        ArrayList::new));
                    .collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
                            Comparator.comparing(ComMngCascadeHouseVO::getAlley))),ArrayList::new));
                cascadeHouseVOList.forEach(cascade -> {
                    cascade.setName(cascade.getAlley());
                });
@@ -544,6 +544,10 @@
        }
    }

    /**
     * 实有房屋数据修复定时任务
     * @return  实有房屋数据修复定时任务
     */
    @Override
    @Transactional
    public R timedTaskHouseJobHandler(){
@@ -576,23 +580,31 @@
                //查询该房屋下人员的关联信息的关系
                for (ComMngPopulationHouseUserDO houseUser : houseUserList) {
                    population = comMngPopulationDAO.selectById(houseUser.getPopulId());
                    if(population.getIsRent().equals(ComMngPopulationDO.isOk.yes)){
                        houseUser.setRelationId(ComMngPopulationHouseUserDO.relationId.zuhu);
                    }else {
                        houseUser.setRelationId(ComMngPopulationHouseUserDO.relationId.zuzhu);
                    if(population != null){
                        if(population.getIsRent() != null && population.getIsRent().equals(ComMngPopulationDO.isOk.yes)){
                            houseUser.setRelationId(ComMngPopulationHouseUserDO.relationId.zuhu);
                        }else {
                            houseUser.setRelationId(ComMngPopulationHouseUserDO.relationId.zuzhu);
                        }
                        updateHouseUserList.add(houseUser);
                    }
                    updateHouseUserList.add(houseUser);
                }
            }

            //查看房子的楼层排序
            if(house.getFloorNum() == null){
            if(house.getFloorNum() == null && StringUtils.isNotEmpty(house.getHouseNo())){
                boolean result = house.getHouseNo().matches("[0-9]+");
                if (result) {// 该字段为纯数字
                    if (house.getHouseNo().length() == 4) {
                        house.setFloorNum(Integer.parseInt(house.getHouseNo().substring(0, 2).replaceAll("^(0+)", "")));
                        String floorNum = house.getHouseNo().substring(0, 2).replaceAll("^(0+)", "");
                        if(StringUtils.isNotEmpty(floorNum)){
                            house.setFloorNum(Integer.parseInt(floorNum));
                        }
                    } else if (house.getHouseNo().length() == 3) {
                        house.setFloorNum(Integer.parseInt(house.getHouseNo().substring(0, 1).replaceAll("^(0+)", "")));
                        String floorNum = house.getHouseNo().substring(0, 1).replaceAll("^(0+)", "");
                        if(StringUtils.isNotEmpty(floorNum)){
                            house.setFloorNum(Integer.parseInt(floorNum));
                        }
                    }
                }
            }