From 219cf838792ab0d50dd042d0fb8c60dd3a1e76f8 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 16 七月 2024 17:56:47 +0800
Subject: [PATCH] feat：部门管理员不展示通知
---
src/main/java/com/mindskip/xzs/controller/student/DashboardController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/student/DashboardController.java b/src/main/java/com/mindskip/xzs/controller/student/DashboardController.java
index 7ca8e44..0cbb263 100644
--- a/src/main/java/com/mindskip/xzs/controller/student/DashboardController.java
+++ b/src/main/java/com/mindskip/xzs/controller/student/DashboardController.java
@@ -22,7 +22,9 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
+import java.time.LocalDateTime;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -108,24 +110,25 @@
ExamTemplatesVO vo = new ExamTemplatesVO();
vo.setStatus("0");
+ vo.setUserId(user.getId());
+ vo.setNow(LocalDateTime.now());
List<ExamTemplates> gets = templatesMapper.gets(vo);
ExamTemplatesUserCountVO templatesUserCountVO = new ExamTemplatesUserCountVO();
templatesUserCountVO.setUserId(user.getId());
for (ExamTemplates get : gets) {
templatesUserCountVO.setId(get.getId());
- List<ExamTemplatesUser> byUserId = examTemplatesUserMapper.getByUserId(user.getId(), get.getId());
- if(byUserId.size()>0){
- List<ExamTemplatesUserCount> byUserIdAndTemplatesId = templatesUserCountMapper.getByUserIdAndTemplatesId(templatesUserCountVO);
- if(byUserIdAndTemplatesId.size()==0){
+ Integer number = templatesUserCountMapper.getCountByUserIdAndTemplatesId(templatesUserCountVO);
+ if(number==0){
PaperInfo info = new PaperInfo();
info.setId(get.getId());
info.setName(get.getName());
info.setStatus("1");
+ info.setCreateTime(get.getCtime());
paperInfos.add(info);
}
- }
}
+ paperInfos = paperInfos.stream().sorted(Comparator.comparing(PaperInfo::getCreateTime).reversed()).collect(Collectors.toList());
indexVM.setFixedPaper(paperInfos);
PaperFilter timeLimitPaperFilter = new PaperFilter();
--
Gitblit v1.8.0