luohairen
2024-11-12 53f8fc0e1e152656652d58a374c973191a527b9d
优化错题查询
3个文件已修改
19 ■■■■ 已修改文件
src/main/java/com/ycl/jxkg/controller/student/WrongController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ycl/jxkg/service/WrongService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ycl/jxkg/service/impl/WrongServiceImpl.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ycl/jxkg/controller/student/WrongController.java
@@ -19,9 +19,9 @@
public class WrongController extends BaseApiController {
    private final WrongService wrongService;
    @PostMapping("/page")
    public Result<WrongResponseVO> page(@RequestBody WrongRequestVo model) {
    @PostMapping("/list")
    public Result<WrongResponseVO> list(@RequestBody WrongRequestVo model) {
        model.setUserId(getCurrentUser().getId());
        return Result.ok(wrongService.page(model));
        return Result.ok(wrongService.list(model));
    }
}
src/main/java/com/ycl/jxkg/service/WrongService.java
@@ -8,6 +8,6 @@
    /**
     * 条件查询错题
     * */
    WrongResponseVO page(WrongRequestVo wrongRequestVo);
    WrongResponseVO list(WrongRequestVo wrongRequestVo);
}
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,10 +85,10 @@
                    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());
        // 分页