From b03d89e792a34c486f0afeab69e837f85d8cbe16 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期二, 25 三月 2025 15:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/service/biz/TaskService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/biz/TaskService.java b/medicalWaste-system/src/main/java/com/sinata/system/service/biz/TaskService.java
index 539195e..5bc7002 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/biz/TaskService.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/biz/TaskService.java
@@ -106,7 +106,8 @@
// 过滤出需要预警的记录
List<MwCollectRecord> recordList = collectRecordList.stream()
.filter(item -> item.getWasteType().equals(configItem.getWasteType()) &&
- DateUtils.timeDistanceHour(new Date(), item.getCollectTime()) > configItem.getValue())
+ DateUtils.timeDistanceHour(new Date(), item.getCollectTime())
+ >= configItem.getValue())
.collect(Collectors.toList());
if (CollUtils.isEmpty(recordList)) {
--
Gitblit v1.7.1