Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei

MrShi

2024-12-03 ff081f4465dd2c37bfcaf6f478e15312ce5cd678

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

@@ -8,8 +8,10 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.YwBuildingMapper;
import com.doumee.dao.business.YwFloorMapper;
import com.doumee.dao.business.YwProjectMapper;
import com.doumee.dao.business.model.YwBuilding;
import com.doumee.dao.business.model.YwFloor;
import com.doumee.dao.business.model.YwProject;
import com.doumee.service.business.YwBuildingService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -36,6 +38,8 @@
    private YwBuildingMapper ywBuildingMapper;
    @Autowired
    private YwProjectMapper ywProjectMapper;
    @Autowired
    private YwFloorMapper ywFloorMapper;

    @Override
    public Integer create(YwBuilding model) {
@@ -58,6 +62,12 @@

    @Override
    public void deleteById(Integer id, LoginUserInfo user) {
        //查询楼宇下的数据
        if(ywFloorMapper.selectCount(new QueryWrapper<YwFloor>().lambda().eq(YwFloor::getIsdeleted,Constants.ZERO)
                .eq(YwFloor::getBuildingId,id))>Constants.ZERO){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"楼宇中存在楼层数据!");
        };

        YwBuilding model = new YwBuilding();
        model.setId(id);
        model.setEditDate(new Date());
@@ -101,7 +111,17 @@

    @Override
    public YwBuilding findById(Integer id) {
        return ywBuildingMapper.selectById(id);


        MPJLambdaWrapper<YwBuilding> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(YwBuilding.class )
                .selectAs(YwProject::getName,YwBuilding::getProjectName)
                .leftJoin(YwProject.class,YwProject::getId,YwBuilding::getProjectId)
                .eq(YwBuilding::getId,id)
                .last(" limit 1 ")
        ;

        return ywBuildingMapper.selectJoinOne(YwBuilding.class, queryWrapper);
    }

    @Override