From f68d3c71819feb59e7a227a5d992b059b900916c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 28 三月 2025 08:28:26 +0800
Subject: [PATCH] 修改报表，界面添加查询流程卡个数，调整推送数据到前端的间隔
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageOutTaskServiceImpl.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageOutTaskServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageOutTaskServiceImpl.java
index c9a2343..fce5ab7 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageOutTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/service/impl/BigStorageCageOutTaskServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
+import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
import com.mes.bigstoragetask.mapper.BigStorageCageOutTaskMapper;
import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
@@ -97,4 +98,39 @@
public void deleteTask(List<BigStorageCageOutTask> outGlassId){
baseMapper.deleteTask(outGlassId);
}
+
+ @Override
+ public List<BigStorageCageOutTask> selectBigStorageCageOutTask(BigStorageCageOutTask bigStorageCageOutTask, String startTime, String endTime){
+ if (endTime != null && !endTime.isEmpty()) {
+ endTime = endTime + " 23:59:59";
+ }
+ LambdaQueryWrapper<BigStorageCageOutTask> wrapper = new LambdaQueryWrapper<>();
+ if (bigStorageCageOutTask.getStartSlot() != null) {
+ wrapper.eq(BigStorageCageOutTask::getStartSlot, bigStorageCageOutTask.getStartSlot());
+ }
+ if (bigStorageCageOutTask.getWidth() != null) {
+ wrapper.eq(BigStorageCageOutTask::getWidth, bigStorageCageOutTask.getWidth());
+ }
+ if (bigStorageCageOutTask.getHeight() != null) {
+ wrapper.eq(BigStorageCageOutTask::getHeight, bigStorageCageOutTask.getHeight());
+ }
+ if (bigStorageCageOutTask.getEndSlot() != 0) {
+ wrapper.eq(BigStorageCageOutTask::getEndSlot, bigStorageCageOutTask.getEndSlot());
+ }
+ if (bigStorageCageOutTask.getTaskState() != -1) {
+ wrapper.eq(BigStorageCageOutTask::getTaskState, bigStorageCageOutTask.getTaskState());
+ }
+ if (startTime != null && !startTime.isEmpty()) {
+ wrapper.ge(BigStorageCageOutTask::getCreateTime, startTime);
+ }
+ if (endTime != null && !endTime.isEmpty()) {
+ wrapper.le(BigStorageCageOutTask::getCreateTime, endTime);
+ }
+ wrapper.orderByDesc(BigStorageCageOutTask::getId);
+ wrapper.and(item -> item.eq(BigStorageCageOutTask::getDeleted, 0)
+ .or()
+ .eq(BigStorageCageOutTask::getDeleted, 1));
+ wrapper.between(BigStorageCageOutTask::getCreateTime, startTime, endTime);
+ return baseMapper.selectList(wrapper);
+ }
}
--
Gitblit v1.8.0