From 17cbd5b9f612f3d29f02f2722357ea334ede2b41 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 31 七月 2025 19:17:43 +0800
Subject: [PATCH] 提交再次试验需要将检验项目的结论重置为null
---
framework/src/main/java/com/yuanchu/mom/service/impl/InformationNotificationServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/mom/service/impl/InformationNotificationServiceImpl.java b/framework/src/main/java/com/yuanchu/mom/service/impl/InformationNotificationServiceImpl.java
index 39c53a4..4f94202 100644
--- a/framework/src/main/java/com/yuanchu/mom/service/impl/InformationNotificationServiceImpl.java
+++ b/framework/src/main/java/com/yuanchu/mom/service/impl/InformationNotificationServiceImpl.java
@@ -85,16 +85,20 @@
Map<String, Object> map = new HashMap<>();
map1 = getLook.selectPowerByMethodAndUserId("selectInsOrderParameter");
Long totalNumberOfMessages = baseMapper.selectCount(Wrappers.<InformationNotification>lambdaQuery()
- .eq(InformationNotification::getConsigneeId, map1.get("userId")));
+ .eq(InformationNotification::getConsigneeId, map1.get("userId"))
+ .apply("DATE(create_time) BETWEEN CURDATE() - INTERVAL 7 DAY AND CURDATE()")
+ .eq(InformationNotification::getViewStatus, false));
Long totalNumberOfReadMessages = baseMapper.selectCount(Wrappers.<InformationNotification>lambdaQuery()
.eq(InformationNotification::getConsigneeId, map1.get("userId"))
+ .apply("DATE(create_time) BETWEEN CURDATE() - INTERVAL 7 DAY AND CURDATE()")
.eq(InformationNotification::getViewStatus, true));
LocalDate today = LocalDate.now();
LocalDate sevenDaysAgo = today.minusDays(7);
Long totalNumberOfMessagesInThePastSevenDays = baseMapper.selectCount(Wrappers.<InformationNotification>lambdaQuery()
.eq(InformationNotification::getConsigneeId, map1.get("userId"))
- .between(InformationNotification::getCreateTime, today, sevenDaysAgo));
+ .between(InformationNotification::getCreateTime, today.atStartOfDay(), sevenDaysAgo.atStartOfDay()));
long remainingToDo = totalNumberOfMessages - totalNumberOfReadMessages;
+ remainingToDo=remainingToDo<0?0:remainingToDo;
map.put("totalNumberOfMessages", totalNumberOfMessages);
map.put("remainingToDo", remainingToDo);
map.put("totalNumberOfReadMessages", totalNumberOfReadMessages);
--
Gitblit v1.9.3