~zhoushihao/YiWuProject.git

			@@ -1,10 +1,18 @@
			package com.mes.hollow.service.impl;

			import com.baomidou.mybatisplus.core.toolkit.StringUtils;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			import com.mes.common.config.Const;
			import com.mes.hollow.entity.HollowBigStorageCage;
			import com.mes.hollow.entity.HollowBigStorageCageDetails;
			import com.mes.hollow.entity.dto.HollowBigStorageAndDetailsDTO;
			import com.mes.hollow.entity.vo.HollowBigStorageDetailsQueryVO;
			import com.mes.hollow.mapper.HollowBigStorageCageMapper;
			import com.mes.hollow.service.HollowBigStorageCageService;
			import org.springframework.stereotype.Service;

			import java.util.List;

			/**
			* (HollowBigStorageCage)表服务实现类
			@@ -15,5 +23,18 @@
			@Service
			public class HollowBigStorageCageServiceImpl extends ServiceImpl<HollowBigStorageCageMapper, HollowBigStorageCage> implements HollowBigStorageCageService {

			@Override
			public List<HollowBigStorageAndDetailsDTO> queryHollowBigStorageCageDetail(HollowBigStorageDetailsQueryVO query) {
			MPJLambdaWrapper<HollowBigStorageCage> wrapper = new MPJLambdaWrapper<>();
			wrapper.selectAll(HollowBigStorageCage.class).selectCollection(HollowBigStorageCageDetails.class, HollowBigStorageCage::getHollowBigStorageCageDetails)
			.leftJoin(HollowBigStorageCageDetails.class, on -> on.eq(HollowBigStorageCageDetails::getSlot, HollowBigStorageCage::getSlot)
			.like(StringUtils.isNotBlank(query.getFilmsId()), HollowBigStorageCageDetails::getFilmsId, query.getFilmsId())
			.like(StringUtils.isNotBlank(query.getFlowCardId()), HollowBigStorageCageDetails::getFlowCardId, query.getFlowCardId())
			.in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL, Const.GLASS_STATE_OUT_ING))
			.eq(HollowBigStorageCage::getDeviceId, query.getDeviceId())
			.orderByAsc(HollowBigStorageCage::getDeviceId)
			.orderByAsc(HollowBigStorageCage::getSlot);
			return baseMapper.selectJoinList(HollowBigStorageAndDetailsDTO.class, wrapper);
			}
			}