From bf04635741203b3a8e16f282fbef3b8cc1b25f0d Mon Sep 17 00:00:00 2001 From: luohairen <3399054449@qq.com> Date: 星期二, 12 十一月 2024 15:19:09 +0800 Subject: [PATCH] 完成错题详情查看 --- src/main/java/com/ycl/jxkg/domain/vo/student/wrong/WrongRequestVo.java | 1 - src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java | 25 +++++++++++++++++++++++++ src/main/java/com/ycl/jxkg/controller/student/WrongController.java | 1 - src/main/java/com/ycl/jxkg/service/impl/WrongServiceImpl.java | 2 +- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java b/src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java index acbdaf4..4e35021 100644 --- a/src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java +++ b/src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java @@ -7,6 +7,7 @@ import com.ycl.jxkg.domain.ExamPaperAnswerInfo; import com.ycl.jxkg.domain.entity.ExamPaperScore; import com.ycl.jxkg.domain.entity.User; +import com.ycl.jxkg.domain.vo.DoQuestionVO; import com.ycl.jxkg.domain.vo.PaperFixQuestionVO; import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperMarkNavbarVO; import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperScoreVO; @@ -23,6 +24,8 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; @RequiredArgsConstructor @@ -99,4 +102,26 @@ return Result.ok(examPaperScoreVO); } + + @RequestMapping(value = "/checkWrong", method = RequestMethod.POST) + public Result<ExamPaperScoreVO> checkWrong(@RequestBody @Valid DoQuestionVO model) { + ExamPaperScore examPaperScore = examPaperScoreService.getById(model.getId()); + ExamPaperScoreVO examPaperScoreVO = new ExamPaperScoreVO(); + BeanUtils.copyProperties(examPaperScore, examPaperScoreVO); + User user = userService.getById(examPaperScore.getUserId()); + examPaperScoreVO.setUserName(Objects.nonNull(user) ? user.getRealName() : "鐢ㄦ埛宸叉敞閿�"); + examPaperScoreVO.setNavbar(JSON.parseArray(examPaperScore.getNavbar(), ExamPaperMarkNavbarVO.class)); + examPaperScoreVO.setTitleItems(JSON.parseArray(examPaperScore.getPaperContent(), PaperFixQuestionVO.class)); + + List<PaperFixQuestionVO> titleItems = new ArrayList<>(); + List<DoQuestionVO> list = new ArrayList<>(); + PaperFixQuestionVO paperFixQuestionVO = new PaperFixQuestionVO(); + paperFixQuestionVO.setQuestionType(model.getQuestionType()); + list.add(model); + paperFixQuestionVO.setQuestionList(list); + titleItems.add(paperFixQuestionVO); + examPaperScoreVO.setTitleItems(titleItems); + return Result.ok(examPaperScoreVO); + } + } diff --git a/src/main/java/com/ycl/jxkg/controller/student/WrongController.java b/src/main/java/com/ycl/jxkg/controller/student/WrongController.java index be66077..cb2d596 100644 --- a/src/main/java/com/ycl/jxkg/controller/student/WrongController.java +++ b/src/main/java/com/ycl/jxkg/controller/student/WrongController.java @@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; @RequiredArgsConstructor @RestController diff --git a/src/main/java/com/ycl/jxkg/domain/vo/student/wrong/WrongRequestVo.java b/src/main/java/com/ycl/jxkg/domain/vo/student/wrong/WrongRequestVo.java index c3c5755..3e88788 100644 --- a/src/main/java/com/ycl/jxkg/domain/vo/student/wrong/WrongRequestVo.java +++ b/src/main/java/com/ycl/jxkg/domain/vo/student/wrong/WrongRequestVo.java @@ -5,7 +5,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; @Data @AllArgsConstructor 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..bca6a68 100644 --- a/src/main/java/com/ycl/jxkg/service/impl/WrongServiceImpl.java +++ b/src/main/java/com/ycl/jxkg/service/impl/WrongServiceImpl.java @@ -91,7 +91,7 @@ }) .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