~zhoushihao/YiWuProject.git

			@@ -3,6 +3,7 @@
			import cn.hutool.core.collection.CollectionUtil;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.mes.common.config.Const;
			import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
			@@ -37,7 +38,23 @@
			RawGlassStorageDetailsService rawGlassStorageDetailsService;

			@Override
			public List<RawGlassStorageTask> queryRawGlassHistoryTask(RawGlassTaskRequest request) {
			public Page<RawGlassStorageTask> queryRawGlassHistoryTask(RawGlassTaskRequest request) {
			if (request.getBeginDate() == null) {
			//设置默认时间 startDate：开始时间 endDate：结束时间
			request.setBeginDate(DateUtil.getBeginDate());
			request.setEndDate(DateUtil.getEndDate());
			}
			Page<RawGlassStorageTask> page = new Page<>(request.getPageNo(), request.getPageSize());
			return page(page, new LambdaQueryWrapper<RawGlassStorageTask>()
			.between(RawGlassStorageTask::getCreateTime, request.getBeginDate(), request.getEndDate())
			.in(CollectionUtil.isNotEmpty(request.getTaskState()), RawGlassStorageTask::getTaskState, request.getTaskState())
			.in(CollectionUtil.isNotEmpty(request.getTaskType()), RawGlassStorageTask::getTaskType, request.getTaskType())
			.orderByDesc(RawGlassStorageTask::getCreateTime));
			}

			@Override
			public List<RawGlassStorageTask> listRawGlassTask() {
			RawGlassTaskRequest request = redisUtil.getCacheObject("rawGlassTaskRequest");
			if (null == request) {
			request = new RawGlassTaskRequest();
			}
			@@ -51,12 +68,6 @@
			.in(CollectionUtil.isNotEmpty(request.getTaskState()), RawGlassStorageTask::getTaskState, request.getTaskState())
			.in(CollectionUtil.isNotEmpty(request.getTaskType()), RawGlassStorageTask::getTaskType, request.getTaskType())
			.orderByDesc(RawGlassStorageTask::getCreateTime));
			}

			@Override
			public List<RawGlassStorageTask> listRawGlassTask() {
			RawGlassTaskRequest request = redisUtil.getCacheObject("rawGlassTaskRequest");
			return queryRawGlassHistoryTask(request);

			}