ll

liukangdong

2024-11-30 f956955c38a67f968977b7d784ff016ab5b17223

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwProjectServiceImpl.java

@@ -13,6 +13,7 @@
import com.doumee.dao.business.vo.CompanyTree;
import com.doumee.dao.business.vo.ProjectDataVO;
import com.doumee.dao.business.vo.ProjectTree;
import com.doumee.service.business.AreasService;
import com.doumee.service.business.YwProjectService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -38,6 +39,8 @@

    @Autowired
    private YwProjectMapper ywProjectMapper;
    @Autowired
    private AreasService areasService;

    @Autowired
    private YwFloorMapper ywFloorMapper;
@@ -171,7 +174,22 @@
            queryWrapper.lambda().eq(YwProject::getAddr, pageWrap.getModel().getAddr());
        }
        queryWrapper.lambda().orderByDesc(YwProject::getCreateDate);
        return PageData.from(ywProjectMapper.selectPage(page, queryWrapper));
        PageData<YwProject> data = PageData.from(ywProjectMapper.selectPage(page, queryWrapper));
        if(data!=null && data.getRecords()!=null){
            for(YwProject model :data.getRecords()){
                    if(model.getAreaId()!=null){
                        Areas a = areasService.findById(model.getAreaId(),Constants.TWO);
                        if(a != null){
                            model.setAreaName(a.getName());
                            model.setCityId(a.getCityId());
                            model.setCityName(a.getCityName());
                            model.setProvinceId(a.getProvinceId());
                            model.setProvinceName(a.getProvinceName());
                        }
                    }
            }
        }
        return data;
    }

    @Override