From 318d743292e40a939619cd9425066e10d67cf482 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 12 十一月 2024 18:20:44 +0800
Subject: [PATCH] 答题记录表、阅卷时保存答题记录
---
src/main/java/com/ycl/jxkg/service/impl/WrongServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/WrongServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/WrongServiceImpl.java
index 5640104..70aa8fe 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/WrongServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/WrongServiceImpl.java
@@ -19,6 +19,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Optional;
import java.util.stream.Collectors;
@Service
@@ -36,7 +37,7 @@
* 鏉′欢鏌ヨ閿欓
* */
@Override
- public WrongResponseVO page(WrongRequestVo wrongRequestVo) {
+ public WrongResponseVO list(WrongRequestVo wrongRequestVo) {
WrongResponseVO wrongResponseVO = new WrongResponseVO();
// 鏌ヨ璇ョ敤鎴风殑鎵�鏈夎�冭瘯
List<ExamPaperScore> examPaperScores = examPaperScoreMapper.selectByUserId(wrongRequestVo.getUserId());
@@ -72,10 +73,10 @@
List<DoQuestionVO> doQuestionVOS = questions.stream()
// 鏍囬涓嶄负绌烘垨绌哄瓧绗︿覆锛屾ā绯婃煡璇�
.filter(question -> {
- if (wrongRequestVo.getTitle() == null || wrongRequestVo.getTitle().trim().equals("")) {
+ if (wrongRequestVo.getTitle() == null || wrongRequestVo.getTitle().trim().isEmpty()) {
return true;
}
- return question.getTitle().toLowerCase().contains(wrongRequestVo.getTitle().toLowerCase());
+ return Optional.ofNullable(question.getTitle()).orElse("").toLowerCase().contains(wrongRequestVo.getTitle().toLowerCase());
})
.filter(question -> {
if (wrongRequestVo.getQuestionType() == null) {
@@ -84,14 +85,14 @@
return question.getQuestionType().equals(wrongRequestVo.getQuestionType());
})
.filter(question -> {
- if (wrongRequestVo.getExamName() == null || wrongRequestVo.getExamName().trim().equals("")) {
+ if (wrongRequestVo.getExamName() == null || wrongRequestVo.getExamName().trim().isEmpty()) {
return true;
}
- return question.getExamName().toLowerCase().contains(wrongRequestVo.getExamName().toLowerCase());
+ return Optional.ofNullable(question.getExamName()).orElse("").toLowerCase().contains(wrongRequestVo.getExamName().toLowerCase());
})
.collect(Collectors.toList());
// 鍒嗛〉
- List<DoQuestionVO> list = doQuestionVOS.stream().skip((wrongRequestVo.getPageIndex() - 1) * wrongRequestVo.getPageSize()).collect(Collectors.toList());
+ List<DoQuestionVO> list = doQuestionVOS.stream().skip((wrongRequestVo.getPageIndex() - 1) * wrongRequestVo.getPageSize()).collect(Collectors.toList()).stream().limit(wrongRequestVo.getPageSize()).collect(Collectors.toList());
wrongResponseVO.setList(list);
wrongResponseVO.setTotal(doQuestionVOS.size());
wrongResponseVO.setPageSize(wrongRequestVo.getPageSize());
--
Gitblit v1.8.0