From c5b38a50819d7ac782a4379bd9eda890d7d119a8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 26 六月 2024 15:47:51 +0800
Subject: [PATCH] 班级、试卷、开始考试优化
---
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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 fe41ab9..f677a78 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -25,6 +25,7 @@
import lombok.RequiredArgsConstructor;
import com.ycl.jxkg.utils.PageUtil;
import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
@@ -138,6 +139,7 @@
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result start(Integer id) {
Exam exam = baseMapper.selectById(id);
if (Objects.isNull(exam)) {
@@ -165,7 +167,6 @@
}
// 杞崲
List<PaperFixQuestionVO> data = this.coverTo(examPaper);
-
return Result.ok().data(data);
} else if (ExamPaperTypeEnum.Random.getCode().equals(examPaper.getPaperType())) {
// 鏍规嵁闅忔満璇曞嵎鐨勯厤缃紝闅忔満鐢熸垚瀵瑰簲棰樼洰
@@ -173,8 +174,13 @@
throw new RuntimeException("璇曞嵎閰嶇疆寮傚父锛岃鑱旂郴鑰佸笀");
}
List<PaperQuestionSettingDTO> paperSettingList = JSON.parseArray(examPaper.getContent(), PaperQuestionSettingDTO.class);
- List<DoQuestionVO> questionList = new ArrayList<>(24);
+
+ // 璇曞嵎鍐呭
+ List<PaperFixQuestionVO> examData = new ArrayList<>(8);
for (PaperQuestionSettingDTO paperSetting : paperSettingList) {
+ PaperFixQuestionVO paperFixQuestionVO = new PaperFixQuestionVO();
+ paperFixQuestionVO.setTitle(paperSetting.getTitle());
+ paperFixQuestionVO.setQuestionType(paperSetting.getQuestionType());
// 鎷垮埌璇剧洰涓嬫煇绫婚鍨嬬殑x閬撻殢鏈洪
List<Question> questions = questionMapper.getRandomQuestion(examPaper.getSubjectId(), paperSetting.getQuestionType(), paperSetting.getNum());
if (paperSetting.getNum() > questions.size()) {
@@ -194,16 +200,17 @@
doQuestionVO.setAudioFile(item.getAudioFile());
return doQuestionVO;
}).collect(Collectors.toList());
- questionList.addAll(childQuestions);
-
+ paperFixQuestionVO.setQuestionList(childQuestions);
+ examData.add(paperFixQuestionVO);
}
- // 淇濇寔闅忔満璇曞嵎鍜屽浐瀹氳瘯鍗风殑鏍煎紡涓�鑷�
- List<PaperFixQuestionVO> examData = new ArrayList<>(1);
- PaperFixQuestionVO paperFixQuestionVO = new PaperFixQuestionVO();
- paperFixQuestionVO.setQuestionList(questionList);
- paperFixQuestionVO.setTitle("");
- paperFixQuestionVO.setQuestionType(null);
- examData.add(paperFixQuestionVO);
+ ExamSubmitTemp examSubmitTemp = new ExamSubmitTemp();
+ examSubmitTemp.setExamId(id);
+ examSubmitTemp.setStatus(ExamSubmitTempStatusEnum.TEMP);
+ examSubmitTemp.setExamSubmit(JSON.toJSONString(examData));
+ examSubmitTemp.setCreateTime(new Date());
+ examSubmitTemp.setUserId(webContext.getCurrentUser().getId());
+ examSubmitTemp.setMarkPaperStatus(ExamSubmitTempStatusEnum.TEMP);
+ examSubmitTempMapper.insert(examSubmitTemp);
return Result.ok(examData);
}
return Result.ok();
--
Gitblit v1.8.0