YiWuProject.git

			@@ -1,9 +1,15 @@
			package com.mes.hollowtask.service.impl;

			import cn.hutool.core.collection.CollectionUtil;
			import cn.smallbun.screw.core.util.StringUtils;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.mes.hollowtask.entity.HollowBigStorageCageHistoryTask;
			import com.mes.hollowtask.entity.request.HollowBigStorageCageHistoryRequest;
			import com.mes.hollowtask.mapper.HollowBigStorageCageHistoryTaskMapper;
			import com.mes.hollowtask.service.HollowBigStorageCageHistoryTaskService;
			import com.mes.tools.DateUtil;
			import org.springframework.stereotype.Service;

			/**
			@@ -15,5 +21,22 @@
			@Service
			public class HollowBigStorageCageHistoryTaskServiceImpl extends ServiceImpl<HollowBigStorageCageHistoryTaskMapper, HollowBigStorageCageHistoryTask> implements HollowBigStorageCageHistoryTaskService {

			@Override
			public Page<HollowBigStorageCageHistoryTask> queryHollowBigStorageCageHistoryTask(HollowBigStorageCageHistoryRequest request) {
			Page<HollowBigStorageCageHistoryTask> page = new Page<>(request.getPageNo(), request.getPageSize());
			if (null == request.getBeginDate()) {
			request.setBeginDate(DateUtil.getBeginDate());
			request.setEndDate(DateUtil.getEndDate());
			}
			LambdaQueryWrapper<HollowBigStorageCageHistoryTask> wrapper = new LambdaQueryWrapper<HollowBigStorageCageHistoryTask>()
			.like(StringUtils.isBlank(request.getGlassId()), HollowBigStorageCageHistoryTask::getGlassId, request.getGlassId())
			.eq(request.getStartSlot() !=0, HollowBigStorageCageHistoryTask::getStartSlot, request.getStartSlot())
			.eq(request.getTargetSlot() !=0, HollowBigStorageCageHistoryTask::getTargetSlot, request.getTargetSlot())
			.in(CollectionUtil.isNotEmpty(request.getTaskStateList()) , HollowBigStorageCageHistoryTask::getTaskState, request.getTaskStateList())
			.in(CollectionUtil.isNotEmpty(request.getTaskTypeList()) , HollowBigStorageCageHistoryTask::getTaskType, request.getTaskTypeList())
			.between(HollowBigStorageCageHistoryTask::getCreateTime, request.getBeginDate(), request.getEndDate())
			.orderByDesc(HollowBigStorageCageHistoryTask::getCreateTime);
			return this.page(page,wrapper);
			}
			}