From b364530ee03f8b28b64863f6a633daf05dc94e91 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 十二月 2024 15:55:19 +0800
Subject: [PATCH] 查询站点的检验时长+产量工时bug+检验任务提交撤销+首页待办查最近七天的信息+高低温检验增加检验表字段
---
framework/src/main/java/com/yuanchu/mom/service/impl/InformationNotificationServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 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 7572a05..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
@@ -3,15 +3,17 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
-import com.yuanchu.mom.pojo.InformationNotification;
import com.yuanchu.mom.mapper.InformationNotificationMapper;
+import com.yuanchu.mom.pojo.InformationNotification;
import com.yuanchu.mom.pojo.InformationNotificationDto;
import com.yuanchu.mom.service.InformationNotificationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -26,12 +28,12 @@
@Service
public class InformationNotificationServiceImpl extends ServiceImpl<InformationNotificationMapper, InformationNotification> implements InformationNotificationService {
- @Autowired
+ @Resource
private GetLook getLook;
@Override
public IPage<InformationNotificationDto> getPage(Page page, String messageType) {
- Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectInsOrderParameter");
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
return baseMapper.getPage(page, messageType, map1.get("userId"));
}
@@ -71,4 +73,36 @@
.eq(InformationNotification::getId, id)
.set(InformationNotification::getViewStatus, true));
}
+
+ @Override
+ public int addInformationNotification(InformationNotification informationNotification) {
+ return baseMapper.insert(informationNotification);
+ }
+
+ @Override
+ public Map<String, Object> getNumberFourTypesMessagesHomePage() {
+ Map<String, Integer> map1 = null;
+ Map<String, Object> map = new HashMap<>();
+ map1 = getLook.selectPowerByMethodAndUserId("selectInsOrderParameter");
+ Long totalNumberOfMessages = 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, 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.atStartOfDay(), sevenDaysAgo.atStartOfDay()));
+ long remainingToDo = totalNumberOfMessages - totalNumberOfReadMessages;
+ remainingToDo=remainingToDo<0?0:remainingToDo;
+ map.put("totalNumberOfMessages", totalNumberOfMessages);
+ map.put("remainingToDo", remainingToDo);
+ map.put("totalNumberOfReadMessages", totalNumberOfReadMessages);
+ map.put("totalNumberOfMessagesInThePastSevenDays", totalNumberOfMessagesInThePastSevenDays);
+ return map;
+ }
}
--
Gitblit v1.9.3