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/ExamServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
index c65ee78..1a77e99 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -79,6 +80,7 @@
private final UserMapper userMapper;
private final ExamPaperScoreMapper examPaperScoreMapper;
private final ExamPaperScoreService examPaperScoreService;
+ private final QuestionAnswerRecordMapper questionAnswerRecordMapper;
private final Producer producer;
@@ -557,10 +559,21 @@
* @return
*/
@Override
- public Result all() {
- List<Exam> entities = baseMapper.selectList(null);
+ public Result all(ExamQuery query) {
+ List<Exam> entities;
+ // 鍒ゆ柇濡傛灉examName涓虹┖鎴栫┖瀛楃涓诧紝鍒欐煡璇㈡墍鏈�
+ if (query.getExamName() == null || query.getExamName().isEmpty()) {
+ entities = baseMapper.selectList(null);
+ }else {
+ entities = baseMapper.selectList(new LambdaQueryWrapper<>(Exam.class).like(Exam::getExamName,query.getExamName()));
+ }
List<ExamVO> vos = entities.stream()
- .map(entity -> ExamVO.getVoByEntity(entity, null))
+ .map(entity -> {
+ ExamVO vo = new ExamVO();
+ vo = ExamVO.getVoByEntity(entity, vo);
+ vo.setStatus(entity.getStatus().getDesc());
+ return vo;
+ })
.collect(Collectors.toList());
return Result.ok().data(vos);
}
@@ -992,10 +1005,12 @@
examPaperScore.setTotalScore(new BigDecimal(examPaperMark.getTotalScore()));
examPaperScore.setJudgeUser(userId);
examPaperScore.setJudgeTime(new Date());
- if (!StringUtils.isEmpty(examPaperMark.getTitleItems())) {
+ if (!org.springframework.util.CollectionUtils.isEmpty(examPaperMark.getTitleItems())) {
examPaperScore.setPaperContent(JSON.toJSONString(examPaperMark.getTitleItems()));
+ // 淇濆瓨绛旈璁板綍
+ this.saveQuestionAnswerRecord(examPaperMark.getUserId(), examPaperMark.getTitleItems());
}
- if (!StringUtils.isEmpty(examPaperMark.getNavbar())) {
+ if (!org.springframework.util.CollectionUtils.isEmpty(examPaperMark.getNavbar())) {
examPaperScore.setNavbar(JSON.toJSONString(examPaperMark.getNavbar()));
}
long questionCorrect = 0;
@@ -1033,6 +1048,29 @@
return Result.ok();
}
+ /**
+ * 淇濆瓨绛旈璁板綍
+ *
+ * @param titleItems
+ */
+ private void saveQuestionAnswerRecord(Integer studentUserId, List<PaperFixQuestionVO> titleItems) {
+ for (PaperFixQuestionVO titleItem : titleItems) {
+ for (DoQuestionVO question : titleItem.getQuestionList()) {
+ QuestionAnswerRecord record = new QuestionAnswerRecord();
+ record.setQuestionType(titleItem.getQuestionType());
+ record.setUserId(studentUserId);
+ record.setDoRight(question.getRight());
+ record.setExamId(question.getExamId());
+ record.setQuestionId(question.getId());
+ record.setScore(question.getScore());
+ record.setUserAnswer(StringUtils.hasText(question.getAnswer()) ? question.getAnswer() : question.getAnswerList().stream().collect(Collectors.joining("銆�")));
+ questionAnswerRecordMapper.insert(record);
+ }
+ }
+
+
+ }
+
@Override
public Result monitorList(ExamQuery query) {
--
Gitblit v1.8.0