bug修改

101captain

2022-05-27 13e7eb21936345a70e77905dd85c2403de80db62

bug修改

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

@@ -6,6 +6,8 @@

import javax.annotation.Resource;

import com.panzhihua.service_community.dao.*;
import com.panzhihua.service_community.model.dos.*;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

@@ -25,14 +27,6 @@
import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingVO;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComActVillageDAO;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.dao.ComMngPopulationHouseDAO;
import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
import com.panzhihua.service_community.model.dos.ComMngPopulationHouseDO;
import com.panzhihua.service_community.model.dos.ComMngVillageDO;
import com.panzhihua.service_community.service.ComMngVillageService;

/**
@@ -50,6 +44,8 @@
    ComMngPopulationDAO populationDAO;
    @Resource
    private ComMngPopulationHouseDAO comMngPopulationHouseDAO;
    @Resource
    private ComMngBuildingDAO comMngBuildingDAO;

    @Override
    public R addComActVillage(ComMngVillageVO comMngVillageVO) {
@@ -231,12 +227,24 @@
        if (comMngVillageDO == null) {
            return R.fail("id有误！");
        }
        BeanUtils.copyProperties(comMngVillageVO, comMngVillageDO);
        comMngVillageDO.setName(comMngVillageVO.getGroupAt());
        Integer count= this.baseMapper.selectCount(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getAlley,comMngVillageVO.getAlley()).eq(ComMngVillageDO::getHouseNum,comMngVillageVO.getHouseNum()));
        if(count>0){
            return R.fail("街路巷已存在");
        }
        ComActDO comActDO = comActDAO.selectById(comMngVillageDO.getCommunityId());
        if (comActDO == null || comActDO.getStreetId() == null) {
            return R.fail("社区没有绑定街道，请绑定后操作！");
        }
        //历史人口数据处理
        List<ComMngPopulationDO> populationDOS=this.populationDAO.selectList(new QueryWrapper<ComMngPopulationDO>().lambda().eq(ComMngPopulationDO::getVillageId,villageId));
        if(!populationDOS.isEmpty()){
            populationDOS.forEach(comMngPopulationDO -> {
                comMngPopulationDO.setAddress(comMngPopulationDO.getAddress().replace(comMngVillageDO.getAlley()+comMngVillageDO.getHouseNum(),comMngVillageVO.getAlley()+comMngVillageVO.getHouseNum()));
                this.populationDAO.updateById(comMngPopulationDO);
            });
        }
        BeanUtils.copyProperties(comMngVillageVO, comMngVillageDO);
        comMngVillageDO.setName(comMngVillageVO.getGroupAt());
        comMngVillageDO.setStreetId(comActDO.getStreetId());
        int update = this.baseMapper.update(comMngVillageDO,
            new LambdaQueryWrapper<ComMngVillageDO>().eq(ComMngVillageDO::getVillageId, villageId));