From 61cae17b15d6a7d256e25ce42f0a4ef4163fd088 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 11 九月 2025 15:54:03 +0800
Subject: [PATCH] 1、删除未修改的大屏程序
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
index 17f9ba1..61ee089 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
@@ -121,5 +121,35 @@
return baseMapper.selectList(new QueryWrapper<DownGlassTask>().eq("task_status", 0).eq("task_type", 2));
}
-
+ @Override
+ public List<DownGlassTask> selectDownGlassTask(DownGlassTask downGlassTask, String startTime, String endTime){
+ if (endTime != null && !endTime.isEmpty()) {
+ endTime = endTime + " 23:59:59";
+ }
+ LambdaQueryWrapper<DownGlassTask> wrapper = new LambdaQueryWrapper<>();
+ if (downGlassTask.getStartCell() != null) {
+ wrapper.eq(DownGlassTask::getStartCell, downGlassTask.getStartCell());
+ }
+ if (downGlassTask.getEndCell() != 0) {
+ wrapper.eq(DownGlassTask::getEndCell, downGlassTask.getEndCell());
+ }
+ if (downGlassTask.getTaskStatus() != -1) {
+ wrapper.eq(DownGlassTask::getTaskStatus, downGlassTask.getTaskStatus());
+ }
+ if (downGlassTask.getTaskType() != -1) {
+ wrapper.eq(DownGlassTask::getTaskType, downGlassTask.getTaskType());
+ }
+ if (startTime != null && !startTime.isEmpty()) {
+ wrapper.ge(DownGlassTask::getCreateTime, startTime);
+ }
+ if (endTime != null && !endTime.isEmpty()) {
+ wrapper.le(DownGlassTask::getCreateTime, endTime);
+ }
+ wrapper.orderByDesc(DownGlassTask::getCreateTime);
+ wrapper.and(item -> item.eq(DownGlassTask::getDeleted, 0)
+ .or()
+ .eq(DownGlassTask::getDeleted, 1));
+ wrapper.between(DownGlassTask::getCreateTime, startTime, endTime);
+ return baseMapper.selectList(wrapper);
+ }
}
--
Gitblit v1.8.0