From 7a9de16c90c1d936c35d426c95c3f4a9bba8a1f8 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 22 十一月 2024 09:25:54 +0800
Subject: [PATCH] 电路试验的计算规则,将检验值转换成绝对值进行判定,不判定的情况加上要求值是中文
---
framework/src/main/java/com/yuanchu/mom/service/impl/InformationNotificationServiceImpl.java | 6 ++++--
1 files changed, 4 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..5350386 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,7 +85,8 @@
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"))
+ .eq(InformationNotification::getViewStatus, false));
Long totalNumberOfReadMessages = baseMapper.selectCount(Wrappers.<InformationNotification>lambdaQuery()
.eq(InformationNotification::getConsigneeId, map1.get("userId"))
.eq(InformationNotification::getViewStatus, true));
@@ -93,8 +94,9 @@
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