From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java
index 2a805b0..0f5efb9 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowqueue/service/impl/HollowGlassQueueInfoServiceImpl.java
@@ -16,6 +16,8 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
@@ -46,6 +48,7 @@
@Override
public List<HollowGlassQueueInfo> queryHollowGlassQueueInfoByLine(int cell) {
+ LocalDateTime twoDaysAgo = LocalDate.now().atStartOfDay().minusDays(1);
List<String> relationIds = this.listObjs(
new LambdaQueryWrapper<HollowGlassQueueInfo>()
.lt(HollowGlassQueueInfo::getState, 1)
@@ -59,6 +62,7 @@
.in("relation_id", relationIds)
.eq("cell", cell)
.eq("is_pair", 1)
+ .ge("create_time", twoDaysAgo)
.select("width","height","flow_card_id","relation_id", "hollow_sequence", "cell", "MAX(state) as state", "MAX(layer) as layer")
.groupBy("relation_id", "hollow_sequence")
.orderByAsc("relation_id", "hollow_sequence")
--
Gitblit v1.8.0