From ec9d3c5d3d12eeeff1b411db98e820d06ce2c086 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 11 三月 2025 15:29:02 +0800
Subject: [PATCH] 1、大理片笼提供历史任务分页查询接口 2、卧式理片笼提供历史任务分页查询接口 3、原片仓储提供历史任务分页查询接口 4、中空理片笼提供历史任务分页查询接口 5、中空流程卡出片任务提供历史任务分页查询接口 6、中空任务按照任务id查询中控队列信息接口
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/impl/BigStorageCageHistoryTaskServiceImpl.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/impl/BigStorageCageHistoryTaskServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/impl/BigStorageCageHistoryTaskServiceImpl.java
index 4cf2843..aae467a 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/impl/BigStorageCageHistoryTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/impl/BigStorageCageHistoryTaskServiceImpl.java
@@ -4,6 +4,7 @@
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.bigstoragecagetask.entity.BigStorageCageHistoryTask;
import com.mes.bigstoragecagetask.entity.request.BigStorageCageHistoryRequest;
@@ -11,8 +12,6 @@
import com.mes.bigstoragecagetask.service.BigStorageCageHistoryTaskService;
import com.mes.tools.DateUtil;
import org.springframework.stereotype.Service;
-
-import java.util.List;
/**
* (BigStorageCageHistoryTask)琛ㄦ湇鍔″疄鐜扮被
@@ -24,23 +23,21 @@
public class BigStorageCageHistoryTaskServiceImpl extends ServiceImpl<BigStorageCageHistoryTaskMapper, BigStorageCageHistoryTask> implements BigStorageCageHistoryTaskService {
@Override
- public List<BigStorageCageHistoryTask> queryBigStorageCageHistoryTask(BigStorageCageHistoryRequest request) {
- if (null == request) {
- request = new BigStorageCageHistoryRequest();
- }
+ public Page<BigStorageCageHistoryTask> queryBigStorageCageHistoryTask(BigStorageCageHistoryRequest request) {
if (null == request.getBeginDate()) {
request.setBeginDate(DateUtil.getBeginDate());
request.setEndDate(DateUtil.getEndDate());
}
+ Page<BigStorageCageHistoryTask> page = new Page<>(request.getPageNo(), request.getPageSize());
LambdaQueryWrapper<BigStorageCageHistoryTask> wrapper = new LambdaQueryWrapper<BigStorageCageHistoryTask>()
- .like(StringUtils.isBlank(request.getGlassId()), BigStorageCageHistoryTask::getGlassId, request.getGlassId())
- .eq(request.getStartSlot() !=0, BigStorageCageHistoryTask::getStartSlot, request.getStartSlot())
- .eq(request.getTargetSlot() !=0, BigStorageCageHistoryTask::getTargetSlot, request.getTargetSlot())
- .in(CollectionUtil.isNotEmpty(request.getTaskStateList()) , BigStorageCageHistoryTask::getTaskState, request.getTaskStateList())
- .in(CollectionUtil.isNotEmpty(request.getTaskTypeList()) , BigStorageCageHistoryTask::getTaskType, request.getTaskTypeList())
+ .like(StringUtils.isNotBlank(request.getGlassId()), BigStorageCageHistoryTask::getGlassId, request.getGlassId())
+ .eq(request.getStartSlot() != 0, BigStorageCageHistoryTask::getStartSlot, request.getStartSlot())
+ .eq(request.getTargetSlot() != 0, BigStorageCageHistoryTask::getTargetSlot, request.getTargetSlot())
+ .in(CollectionUtil.isNotEmpty(request.getTaskStateList()), BigStorageCageHistoryTask::getTaskState, request.getTaskStateList())
+ .in(CollectionUtil.isNotEmpty(request.getTaskTypeList()), BigStorageCageHistoryTask::getTaskType, request.getTaskTypeList())
.between(BigStorageCageHistoryTask::getCreateTime, request.getBeginDate(), request.getEndDate())
.orderByDesc(BigStorageCageHistoryTask::getCreateTime);
- return this.list(wrapper);
+ return this.page(page, wrapper);
}
}
--
Gitblit v1.8.0