From d526b031d167f76ae22ad53d3221a59d38abc388 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期五, 24 五月 2024 18:08:23 +0800
Subject: [PATCH] feat:人数分布统计支持随机试卷

---
 src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java
index b33c030..8eb7a39 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperServiceImpl.java
@@ -637,7 +637,10 @@
 
     @Override
     public List<ExamPaper> list(List<Integer> deptIds) {
-        return examPaperMapper.list(deptIds);
+        List<ExamPaper> list = examPaperMapper.list(deptIds);
+        List<ExamPaper> template = examPaperMapper.template(deptIds);
+        list.addAll(template);
+        return list.stream().sorted(Comparator.comparing(ExamPaper::getCreateTime).reversed()).collect(Collectors.toList());
     }
 
     @Override

--
Gitblit v1.8.0