From ea3bcc24543202a55b22623cad8dd8900d550242 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期二, 29 十月 2024 14:05:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
index 612d808..db198fe 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
@@ -328,12 +328,13 @@
public List<ExamPaper> myExamPaper(Integer paperType) {
Integer userId = webContext.getCurrentUser().getId();
List<ExamPaper> list = new LambdaQueryChainWrapper<>(baseMapper)
- .select(ExamPaper::getId, ExamPaper::getName, ExamPaper::getVisibility)
+ .select(ExamPaper::getId, ExamPaper::getName, ExamPaper::getVisibility,ExamPaper::getSuggestTime)
.eq(ExamPaper::getCreateUser, userId)
.eq(Objects.nonNull(paperType), ExamPaper::getPaperType, paperType)
.or()
.eq(ExamPaper::getVisibility, VisibilityEnum.Public.getName())
.eq(Objects.nonNull(paperType), ExamPaper::getPaperType, paperType)
+ .orderByDesc(ExamPaper::getId)
.list();
list.stream().forEach(item -> {
if (VisibilityEnum.Public.getName().equals(item.getVisibility())) {
@@ -382,6 +383,7 @@
// 鏌ュ嚭鎵�鏈夌殑璇剧洰锛坋xcel涓嬫媺鏁版嵁锛�
List<Subject> subjects = subjectService.list();
List<String> subjectNameList = subjects.stream().map(Subject::getName).collect(Collectors.toList());
+
EasyExcel.write(response.getOutputStream(), ExamPaperImportVO.class)
.sheet("妯℃澘")
.registerWriteHandler(new PaperSelectExcel(subjectNameList))
--
Gitblit v1.8.0