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/controller/BigStorageCageFeedTaskController.java | 35 +----------------------------------
1 files changed, 1 insertions(+), 34 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageFeedTaskController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageFeedTaskController.java
index c69669b..161856d 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageFeedTaskController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageFeedTaskController.java
@@ -44,40 +44,7 @@
public Result selectBigStorageCageFeedTask(@RequestBody BigStorageCageFeedTask bigStorageCageFeedTask,
@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime) {
- if (endTime != null && !endTime.isEmpty()) {
- endTime = endTime + " 23:59:59";
- }
- LambdaQueryWrapper<BigStorageCageFeedTask> wrapper = new LambdaQueryWrapper<>();
- if (bigStorageCageFeedTask.getTargetSlot() != null) {
- wrapper.eq(BigStorageCageFeedTask::getTargetSlot, bigStorageCageFeedTask.getTargetSlot());
- }
- if (bigStorageCageFeedTask.getWidth() != null) {
- wrapper.eq(BigStorageCageFeedTask::getWidth, bigStorageCageFeedTask.getWidth());
- }
- if (bigStorageCageFeedTask.getHeight() != null) {
- wrapper.eq(BigStorageCageFeedTask::getHeight, bigStorageCageFeedTask.getHeight());
- }
- if (bigStorageCageFeedTask.getLine() != 0) {
- wrapper.eq(BigStorageCageFeedTask::getLine, bigStorageCageFeedTask.getLine());
- }
- if (bigStorageCageFeedTask.getTaskState() != -1) {
- wrapper.eq(BigStorageCageFeedTask::getTaskState, bigStorageCageFeedTask.getTaskState());
- }
- if (bigStorageCageFeedTask.getTaskType() != 0) {
- wrapper.eq(BigStorageCageFeedTask::getTaskType, bigStorageCageFeedTask.getTaskType());
- }
- if (startTime != null && !startTime.isEmpty()) {
- wrapper.ge(BigStorageCageFeedTask::getCreateTime, startTime);
- }
- if (endTime != null && !endTime.isEmpty()) {
- wrapper.le(BigStorageCageFeedTask::getCreateTime, endTime);
- }
- wrapper.orderByDesc(BigStorageCageFeedTask::getId);
- wrapper.and(item -> item.eq(BigStorageCageFeedTask::getDeleted, 0)
- .or()
- .eq(BigStorageCageFeedTask::getDeleted, 1));
- wrapper.between(BigStorageCageFeedTask::getCreateTime, startTime, endTime);
- return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageFeedTaskService.list(wrapper));
+ return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageFeedTaskService.selectBigStorageCageFeedTask(bigStorageCageFeedTask, startTime, endTime));
}
--
Gitblit v1.8.0