From 12aa6d1bbe7b386f81731d797942b6a1ac7e3a2f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 26 六月 2024 13:49:58 +0800
Subject: [PATCH] 班级学员新增bug
---
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 212 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 182 insertions(+), 30 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 a73b531..04194a2 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -5,11 +5,17 @@
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.ycl.jxkg.context.WebContext;
import com.ycl.jxkg.domain.entity.*;
+import com.ycl.jxkg.domain.exam.PaperFixQuestionDTO;
+import com.ycl.jxkg.domain.exam.PaperQuestionSettingDTO;
+import com.ycl.jxkg.domain.question.QuestionObject;
import com.ycl.jxkg.domain.vo.*;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO;
+import com.ycl.jxkg.enums.ExamPaperTypeEnum;
import com.ycl.jxkg.enums.QuestionTypeEnum;
import com.ycl.jxkg.enums.general.ExamStatusEnum;
import com.ycl.jxkg.enums.general.ExamSubmitTempStatusEnum;
import com.ycl.jxkg.mapper.*;
+import com.ycl.jxkg.service.ExamPaperService;
import com.ycl.jxkg.service.ExamService;
import com.ycl.jxkg.base.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -22,10 +28,7 @@
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -44,6 +47,7 @@
private final ExamSubmitTempMapper examSubmitTempMapper;
private final ClassesUserMapper classesUserMapper;
private final ExamPaperMapper examPaperMapper;
+ private final ExamPaperService examPaperService;
/**
* 娣诲姞
@@ -110,7 +114,7 @@
@Override
public Result page(ExamQuery query) {
IPage<ExamVO> page = PageUtil.getPage(query, ExamVO.class);
- baseMapper.getPage(page, query);
+ baseMapper.getPage(page, query, webContext.getCurrentUser().getId());
page.getRecords().stream().forEach(item -> {
if (! StringUtils.hasText(item.getClassName())) {
item.setClassName("鐝骇涓嶅瓨鍦ㄦ垨琚垹闄�");
@@ -122,6 +126,118 @@
}
});
return Result.ok().data(page.getRecords()).total(page.getTotal());
+ }
+
+
+ @Override
+ public Result studentPage(ExamQuery query) {
+ IPage<ExamVO> page = PageUtil.getPage(query, ExamVO.class);
+ baseMapper.studentPage(page, query, webContext.getCurrentUser().getId());
+ return Result.ok().data(page.getRecords()).total(page.getTotal());
+ }
+
+
+ @Override
+ public Result start(Integer id) {
+ Exam exam = baseMapper.selectById(id);
+ if (Objects.isNull(exam)) {
+ throw new RuntimeException("璇ヨ�冭瘯涓嶅瓨鍦�");
+ }
+ if (Objects.isNull(exam.getExamPaperId())) {
+ throw new RuntimeException("鑰冭瘯鏈粦瀹氳瘯鍗�");
+ }
+ if (ExamStatusEnum.NOT_START.equals(exam.getStatus())) {
+ throw new RuntimeException("鑰冭瘯杩樻湭寮�濮�");
+ }
+ if (ExamStatusEnum.FINISHED.equals(exam.getStatus())) {
+ throw new RuntimeException("鑰冭瘯宸茬粡缁撴潫");
+ }
+ // 鏌ュ嚭鑰冭瘯璇曞嵎
+ ExamPaper examPaper = examPaperMapper.selectById(exam.getExamPaperId());
+ if (Objects.isNull(examPaper)) {
+ throw new RuntimeException("璇曞嵎涓嶅瓨鍦�");
+ }
+ // 灏嗛鐩浆鎹负鍙复鏃朵繚瀛樼殑棰樼洰缁撴瀯銆傚浐瀹氳瘯鍗峰拰闅忓簭璇曞嵎鐨勯鐩槸鐩存帴淇濆瓨鍒癱ontent瀛楁鐨�
+ if (ExamPaperTypeEnum.Fixed.getCode().equals(examPaper.getPaperType())
+ || ExamPaperTypeEnum.RandomOrder.getCode().equals(examPaper.getPaperType())) {
+ if (StringUtils.hasText(examPaper.getContent())) {
+ throw new RuntimeException("璇曞嵎棰樼洰涓虹┖");
+ }
+ // 杞崲
+ List<PaperFixQuestionVO> data = this.coverTo(examPaper);
+ return Result.ok().data(data);
+ } else if (ExamPaperTypeEnum.Random.getCode().equals(examPaper.getPaperType())) {
+ // 鏍规嵁闅忔満璇曞嵎鐨勯厤缃紝闅忔満鐢熸垚瀵瑰簲棰樼洰
+ if (! StringUtils.hasText(examPaper.getContent())) {
+ throw new RuntimeException("璇曞嵎閰嶇疆寮傚父锛岃鑱旂郴鑰佸笀");
+ }
+ List<PaperQuestionSettingDTO> paperSettingList = JSON.parseArray(examPaper.getContent(), PaperQuestionSettingDTO.class);
+
+ // 璇曞嵎鍐呭
+ 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()) {
+ throw new RuntimeException("閰嶇疆鐨勯鐩暟涓嶈冻浠ョ敓鎴愯瘯鍗�");
+ }
+ // 鎷垮埌棰樼洰鍚庣粍瑁呬负鍙复鏃朵繚瀛樼殑棰樼洰缁撴瀯
+ List<DoQuestionVO> childQuestions = questions.stream().map(item -> {
+ DoQuestionVO doQuestionVO = new DoQuestionVO();
+ doQuestionVO.setTitle(item.getTitle());
+ doQuestionVO.setQuestionType(item.getQuestionType());
+ if (StringUtils.hasText(item.getContent())) {
+ QuestionObject questionObject = JSON.parseObject(item.getContent(), QuestionObject.class);
+ doQuestionVO.setQuestionItemList(questionObject.getQuestionItemObjects());
+ }
+ doQuestionVO.setId(item.getId());
+ doQuestionVO.setOriginalFile(item.getOriginalFile());
+ doQuestionVO.setAudioFile(item.getAudioFile());
+ return doQuestionVO;
+ }).collect(Collectors.toList());
+ paperFixQuestionVO.setQuestionList(childQuestions);
+ examData.add(paperFixQuestionVO);
+ }
+ return Result.ok(examData);
+ }
+ return Result.ok();
+ }
+
+ /**
+ * 灏嗘暟鎹簱瀛樺偍鐨勯鐩紝杞负鍙复鏃朵繚瀛樼殑棰樼洰缁撴瀯
+ *
+ * @param examPaper 璇曞嵎
+ * @return
+ */
+ private List<PaperFixQuestionVO> coverTo(ExamPaper examPaper) {
+ if (! StringUtils.hasText(examPaper.getContent())) {
+ throw new RuntimeException("璇曞嵎鏈厤缃鐩紝璇疯仈绯昏�佸笀");
+ }
+ List<PaperFixQuestionDTO> questionWarpList = JSON.parseArray(examPaper.getContent(), PaperFixQuestionDTO.class);
+ return questionWarpList.stream().map(item -> {
+ PaperFixQuestionVO vo = new PaperFixQuestionVO();
+ vo.setTitle(item.getTitle());
+ vo.setQuestionType(item.getQuestionType());
+ List<DoQuestionVO> doQuestionVOS = item.getQuestionList().stream().map(question -> {
+ DoQuestionVO doQuestionVO = new DoQuestionVO();
+ doQuestionVO.setTitle(question.getTitle());
+ doQuestionVO.setQuestionType(item.getQuestionType());
+ doQuestionVO.setQuestionItemList(question.getItems());
+ doQuestionVO.setId(question.getId());
+ doQuestionVO.setOriginalFile(question.getOriginalFile());
+ doQuestionVO.setAudioFile(question.getAudioFile());
+ return doQuestionVO;
+ }).collect(Collectors.toList());
+ if (ExamPaperTypeEnum.RandomOrder.getCode().equals(examPaper.getPaperType())) {
+ // 闅忓簭璇曞嵎鎵撲贡椤哄簭
+ Collections.shuffle(doQuestionVOS);
+ }
+ vo.setQuestionList(doQuestionVOS);
+ return vo;
+ }).collect(Collectors.toList());
}
/**
@@ -151,6 +267,12 @@
return Result.ok().data(vos);
}
+ /**
+ * 涓诲姩鎻愪氦璇曞嵎
+ *
+ * @param submitData 璇曞嵎鍋氶鎻愪氦鏁版嵁
+ * @return
+ */
@Override
public Result examSubmit(ExamSubmitVO submitData) {
// 鏍￠獙
@@ -158,27 +280,31 @@
if (Objects.isNull(exam)) {
throw new RuntimeException("璇ヨ�冭瘯涓嶅瓨鍦�");
}
- // 鍒ゆ柇鍗曢�夈�佸閫夈�佸垽鏂瀵归敊
- List<Integer> questionIds = submitData.getQuestionList().stream().map(DoQuestionVO::getId).collect(Collectors.toList());
- List<Question> questionList = questionMapper.getAnswerInfo(questionIds);
- Map<Integer, Question> answerMap = questionList.stream().collect(Collectors.toMap(Question::getId, entity -> entity));
- submitData.getQuestionList().stream().forEach(item -> {
- Question question = answerMap.get(item.getId());
- if (Objects.nonNull(question)
- && (QuestionTypeEnum.SingleChoice.getCode().equals(question.getQuestionType())
- || QuestionTypeEnum.MultipleChoice.getCode().equals(question.getQuestionType())
- || QuestionTypeEnum.TrueFalse.getCode().equals(question.getQuestionType())
- )) {
- String correct = question.getCorrect();
- if (QuestionTypeEnum.MultipleChoice.getCode().equals(question.getQuestionType())) {
- // 濡傛灉鏄�夋嫨棰橈紝閭ｄ箞灏嗙瓟妗堣浆涓簂ist
- List<String> answerList = JSON.parseArray(correct, String.class);
- item.setRight(answerList.containsAll(item.getAnswerList()));
- } else {
- item.setRight(question.getCorrect().equals(item.getAnswer()));
- }
- }
- });
+// // 鍒ゆ柇鍗曢�夈�佸閫夈�佸垽鏂瀵归敊
+// List<Integer> questionIds = new ArrayList<>(24);
+// submitData.getPaperQuestionList().forEach(item -> {
+// List<Integer> ids = item.getQuestionList().stream().map(DoQuestionVO::getId).collect(Collectors.toList());
+// questionIds.addAll(ids);
+// });
+// List<Question> questionList = questionMapper.getAnswerInfo(questionIds);
+// Map<Integer, Question> answerMap = questionList.stream().collect(Collectors.toMap(Question::getId, entity -> entity));
+// submitData.getQuestionList().stream().forEach(item -> {
+// Question question = answerMap.get(item.getId());
+// if (Objects.nonNull(question)
+// && (QuestionTypeEnum.SingleChoice.getCode().equals(question.getQuestionType())
+// || QuestionTypeEnum.MultipleChoice.getCode().equals(question.getQuestionType())
+// || QuestionTypeEnum.TrueFalse.getCode().equals(question.getQuestionType())
+// )) {
+// String correct = question.getCorrect();
+// if (QuestionTypeEnum.MultipleChoice.getCode().equals(question.getQuestionType())) {
+// // 濡傛灉鏄�夋嫨棰橈紝閭ｄ箞灏嗙瓟妗堣浆涓簂ist
+// List<String> answerList = JSON.parseArray(correct, String.class);
+// item.setRight(answerList.containsAll(item.getAnswerList()));
+// } else {
+// item.setRight(question.getCorrect().equals(item.getAnswer()));
+// }
+// }
+// });
// 闃呭嵎鍚庢墠寰�exam_paper_answer淇濆瓨鑰冭瘯鎴愮哗銆佷互鍙婁繚瀛樺埌exam_paper_customer_answer
// 鐜板湪鍙渶瑕佷繚瀛樺埌涓�寮犱复鏃惰〃
// 璇ユ帴鍙ｆ槸涓诲姩鎻愪氦锛屾墍浠ョ姸鎬侀兘璁剧疆涓哄畬鎴愶紝浠ヤ究鍚庣画鑰佸笀闃呭嵎
@@ -186,6 +312,12 @@
return Result.ok();
}
+ /**
+ * 涓存椂淇濆瓨璇曞嵎
+ *
+ * @param submitData
+ * @return
+ */
@Override
public Result timingSubmit(ExamSubmitVO submitData) {
saveTempExam(submitData, ExamSubmitTempStatusEnum.TEMP);
@@ -193,7 +325,7 @@
}
/**
- * 淇濆瓨涓存椂璇曞嵎
+ * 淇濆瓨璇曞嵎锛氬鏋滄帴鍙ｆ槸瀹氭椂淇濆瓨閭ｄ箞鏄复鏃惰瘯鍗枫�傚鏋滄帴鍙ｆ槸鑷富鎻愪氦閭ｄ箞鏄畬鎴愯瘯鍗�
*
* @param submitData 鍓嶇浼犻�掔殑璇曞嵎鏁版嵁
* @param status 璇曞嵎鐨勭姸鎬�
@@ -208,7 +340,7 @@
return;
}
one.setDoTime(submitData.getDoTime());
- one.setExamSubmit(JSON.toJSONString(submitData.getQuestionList()));
+ one.setExamSubmit(JSON.toJSONString(submitData.getPaperQuestionList()));
one.setCreateTime(new Date());
one.setStatus(status);
examSubmitTempMapper.updateById(one);
@@ -218,14 +350,14 @@
examSubmitTemp.setDoTime(submitData.getDoTime());
examSubmitTemp.setStatus(status);
examSubmitTemp.setUserId(webContext.getCurrentUser().getId());
- examSubmitTemp.setExamSubmit(JSON.toJSONString(submitData.getQuestionList()));
+ examSubmitTemp.setExamSubmit(JSON.toJSONString(submitData.getPaperQuestionList()));
examSubmitTemp.setMarkPaperStatus(ExamSubmitTempStatusEnum.TEMP);
examSubmitTempMapper.insert(examSubmitTemp);
}
}
@Override
- public Result getMarkPaperInfo(Integer id) {
+ public Result getMarkResultInfo(Integer id) {
Exam exam = baseMapper.selectById(id);
if (Objects.isNull(exam)) {
throw new RuntimeException("璇ヨ�冭瘯涓嶅瓨鍦�");
@@ -264,4 +396,24 @@
markPaperVO.setSuggestTime(examPaper.getSuggestTime());
return Result.ok().data(markPaperVO);
}
+
+
+ @Override
+ public Result getMarkPaperInfo(Integer examId, Integer userId) {
+ ExamSubmitTemp userExam = new LambdaQueryChainWrapper<>(examSubmitTempMapper)
+ .eq(ExamSubmitTemp::getExamId, examId)
+ .eq(ExamSubmitTemp::getUserId, userId)
+ .one();
+ if (Objects.isNull(userExam)) {
+ throw new RuntimeException("璇ュ鍛樿�冭瘯璁板綍涓嶅瓨鍦�");
+ }
+ ExamSubmitVO vo = new ExamSubmitVO();
+ vo.setExamId(userExam.getExamId());
+ vo.setDoTime(userExam.getDoTime());
+ vo.setUpdateTime(userExam.getUpdateTime());
+ if (StringUtils.hasText(userExam.getExamSubmit())) {
+ vo.setPaperQuestionList(JSON.parseArray(userExam.getExamSubmit(), PaperFixQuestionVO.class));
+ }
+ return Result.ok(vo);
+ }
}
--
Gitblit v1.8.0