From 9dee3e46fdb59eb67b26f8c1958007025d1b7c29 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 01 七月 2024 13:13:49 +0800
Subject: [PATCH] 阅卷补充题目答案,开始考试分页bug，开始考试补充数据
---
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 274 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 180 insertions(+), 94 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 73ca4c6..70dc960 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -1,6 +1,7 @@
package com.ycl.jxkg.service.impl;
import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
@@ -16,9 +17,10 @@
import com.ycl.jxkg.domain.form.ExamForm;
import com.ycl.jxkg.domain.form.ForceSubmitForm;
import com.ycl.jxkg.domain.query.ExamQuery;
+import com.ycl.jxkg.domain.question.QuestionItemObject;
import com.ycl.jxkg.domain.question.QuestionObject;
import com.ycl.jxkg.domain.vo.*;
-import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperMarkAnswerVO;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperMarkNavbarVO;
import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperMarkVO;
import com.ycl.jxkg.enums.DeductTypeEnum;
import com.ycl.jxkg.enums.ExamPaperTypeEnum;
@@ -28,6 +30,7 @@
import com.ycl.jxkg.enums.general.ExamSubmitTempStatusEnum;
import com.ycl.jxkg.mapper.*;
import com.ycl.jxkg.server.WebsocketServer;
+import com.ycl.jxkg.service.ExamPaperScoreService;
import com.ycl.jxkg.service.ExamPaperService;
import com.ycl.jxkg.service.ExamService;
import com.ycl.jxkg.utils.PageUtil;
@@ -63,8 +66,8 @@
private final WebsocketServer websocketServer;
private final UserMapper userMapper;
private final ExamPaperScoreMapper examPaperScoreMapper;
- private final ExamPaperScoreDetailMapper examPaperScoreDetailMapper;
-
+ private final ExamPaperScoreService examPaperScoreService;
+ private static final String ANSWER_SPLIT = ",";
/**
* 娣诲姞
*
@@ -194,13 +197,13 @@
startExamVO.setId(exam.getId());
startExamVO.setSuggestTime(examPaper.getSuggestTime());
// 璇曞嵎鍐呭
- List<PaperFixQuestionVO> examData;
+ List<PaperFixQuestionVO> examData = new ArrayList<>();
// 鎷垮埌棰樼洰鍓湰鏁版嵁
List<QuestionAnswerCopyVO> questionAnswerCopyVOList = new ArrayList<>(32);
// 灏嗛鐩浆鎹负鍙复鏃朵繚瀛樼殑棰樼洰缁撴瀯銆傚浐瀹氳瘯鍗峰拰闅忓簭璇曞嵎鐨勯鐩槸鐩存帴淇濆瓨鍒癱ontent瀛楁鐨�
if (ExamPaperTypeEnum.Fixed.getCode().equals(examPaper.getPaperType())
|| ExamPaperTypeEnum.RandomOrder.getCode().equals(examPaper.getPaperType())) {
- if (StringUtils.hasText(examPaper.getContent())) {
+ if (!StringUtils.hasText(examPaper.getContent())) {
throw new RuntimeException("璇曞嵎棰樼洰涓虹┖");
}
// 杞崲
@@ -227,6 +230,8 @@
DoQuestionVO doQuestionVO = new DoQuestionVO();
doQuestionVO.setTitle(item.getTitle());
doQuestionVO.setQuestionType(item.getQuestionType());
+ //浠庨厤缃噷鎷块鐩垎鏁�
+ doQuestionVO.setQuestionScore(paperSetting.getScore());
if (StringUtils.hasText(item.getContent())) {
QuestionObject questionObject = JSON.parseObject(item.getContent(), QuestionObject.class);
doQuestionVO.setQuestionItemList(questionObject.getQuestionItemObjects());
@@ -237,8 +242,19 @@
// 棰樼洰鍓湰
QuestionAnswerCopyVO copy = new QuestionAnswerCopyVO();
+ copy.setId(item.getId());
+ copy.setDifficult(item.getDifficult());
copy.setAnalyze(JSON.parseObject(item.getContent(), PaperQuestion.class).getAnalyze());
- copy.setCorrect(item.getCorrect());
+ //濉┖鐨勭瓟妗堝湪Json閲�
+ if (QuestionTypeEnum.GapFilling.getCode().equals(item.getQuestionType())) {
+ List<String> gapAnswer = new ArrayList<>();
+ for (QuestionItemObject questionItemObject : doQuestionVO.getQuestionItemList()) {
+ gapAnswer.add(questionItemObject.getContent());
+ }
+ copy.setCorrect(String.join(ANSWER_SPLIT, gapAnswer));
+ } else {
+ copy.setCorrect(item.getCorrect());
+ }
questionAnswerCopyVOList.add(copy);
return doQuestionVO;
@@ -246,26 +262,25 @@
paperFixQuestionVO.setQuestionList(childQuestions);
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);
- examSubmitTemp.setQuestionAnswerCopy(JSON.toJSONString(questionAnswerCopyVOList));
- examSubmitTempMapper.insert(examSubmitTemp);
-
- startExamVO.setTitleList(examData);
return Result.ok(startExamVO);
}
- return Result.ok();
+ 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);
+ examSubmitTemp.setQuestionAnswerCopy(JSON.toJSONString(questionAnswerCopyVOList));
+ examSubmitTempMapper.insert(examSubmitTemp);
+ startExamVO.setTitleList(examData);
+ return Result.ok(startExamVO);
}
/**
* 灏嗘暟鎹簱瀛樺偍鐨勯鐩紝杞负鍙复鏃朵繚瀛樼殑棰樼洰缁撴瀯
*
- * @param examPaper 璇曞嵎
+ * @param examPaper 璇曞嵎
* @param questionAnswerCopyVOList 棰樼洰鍓湰闆嗗悎
* @return
*/
@@ -282,7 +297,8 @@
DoQuestionVO doQuestionVO = new DoQuestionVO();
doQuestionVO.setTitle(question.getTitle());
doQuestionVO.setQuestionType(item.getQuestionType());
-
+ //澧炲姞棰樼洰鍒嗘暟
+ doQuestionVO.setQuestionScore(question.getScore());
// 濉┖棰橀渶瑕佹姽闄ontent(鍥犱负鏄瓟妗�)
if (QuestionTypeEnum.GapFilling.getCode().equals(doQuestionVO.getQuestionType())) {
question.getItems().stream().forEach(option -> {
@@ -296,8 +312,19 @@
// 棰樼洰鍓湰
QuestionAnswerCopyVO copy = new QuestionAnswerCopyVO();
+ copy.setId(question.getId());
copy.setAnalyze(question.getAnalyze());
- copy.setCorrect(question.getCorrect());
+ copy.setDifficult(question.getDifficult());
+ //濉┖鐨勭瓟妗堝湪Json閲�
+ if (QuestionTypeEnum.GapFilling.getCode().equals(item.getQuestionType())) {
+ List<String> gapAnswer = new ArrayList<>();
+ for (QuestionItemObject questionItemObject : doQuestionVO.getQuestionItemList()) {
+ gapAnswer.add(questionItemObject.getContent());
+ }
+ copy.setCorrect(String.join(ANSWER_SPLIT, gapAnswer));
+ } else {
+ copy.setCorrect(question.getCorrect());
+ }
questionAnswerCopyVOList.add(copy);
return doQuestionVO;
@@ -379,8 +406,10 @@
// 闃呭嵎鍚庢墠寰�exam_paper_answer淇濆瓨鑰冭瘯鎴愮哗銆佷互鍙婁繚瀛樺埌exam_paper_customer_answer
// 鐜板湪鍙渶瑕佷繚瀛樺埌涓�寮犱复鏃惰〃
// 璇ユ帴鍙ｆ槸涓诲姩鎻愪氦锛屾墍浠ョ姸鎬侀兘璁剧疆涓哄畬鎴愶紝浠ヤ究鍚庣画鑰佸笀闃呭嵎
- //TODO
saveTempExam(submitData, ExamSubmitTempStatusEnum.finish);
+
+ //TODO:鑰冭瘯鐘舵�佽瀹氫负缁撴潫
+
return Result.ok();
}
@@ -392,7 +421,6 @@
*/
@Override
public Result timingSubmit(StartExamVO submitData) {
- //TODO
saveTempExam(submitData, ExamSubmitTempStatusEnum.temp);
return Result.ok();
}
@@ -407,19 +435,19 @@
ExamSubmitTemp one = new LambdaQueryChainWrapper<>(examSubmitTempMapper)
.eq(ExamSubmitTemp::getExamId, submitData.getId())
.eq(ExamSubmitTemp::getUserId, webContext.getCurrentUser().getId())
- .eq(ExamSubmitTemp::getDeleted,0)
+ .eq(ExamSubmitTemp::getDeleted, 0)
.one();
if (Objects.nonNull(one)) {
- long doTimeL = one.getUpdateTime().getTime() - one.getCreateTime().getTime();
- Integer doTime = (int) doTimeL;
- //TODO
if (ExamSubmitTempStatusEnum.finish.equals(one.getStatus())) {
return;
}
- one.setDoTime(doTime);
+ Date now = new Date();
one.setExamSubmit(JSON.toJSONString(submitData.getTitleList()));
- one.setUpdateTime(new Date());
+ one.setUpdateTime(now);
+ long doTimeL = now.getTime() - one.getCreateTime().getTime();
+ Integer doTime = (int) doTimeL;
+ one.setDoTime(doTime);
one.setStatus(status);
examSubmitTempMapper.updateById(one);
} else {
@@ -429,7 +457,6 @@
examSubmitTemp.setStatus(status);
examSubmitTemp.setUserId(webContext.getCurrentUser().getId());
examSubmitTemp.setExamSubmit(JSON.toJSONString(submitData.getTitleList()));
- //TODO
examSubmitTemp.setMarkPaperStatus(ExamSubmitTempStatusEnum.temp);
examSubmitTempMapper.insert(examSubmitTemp);
}
@@ -446,12 +473,12 @@
throw new RuntimeException("鑰冭瘯璇曞嵎涓嶅瓨鍦�");
}
List<ExamSubmitTemp> examSubmitTempList = new LambdaQueryChainWrapper<>(examSubmitTempMapper)
+ .eq(ExamSubmitTemp::getDeleted,0)
.eq(ExamSubmitTemp::getExamId, id)
.list();
// 鍙傝�冧汉鏁�
Integer joinExamNum = examSubmitTempList.size();
// 鍙傝�冧絾鏈畬鎴愭彁浜や汉鏁�
- //TODO
Integer joinButNotFinishedNum = Math.toIntExact(examSubmitTempList.stream().filter(item -> ExamSubmitTempStatusEnum.temp.equals(item.getStatus())).count());
List<StudentExamInfoVO> studentExamList = classesUserMapper.getClassesUserList(exam.getClassesId());
@@ -488,81 +515,95 @@
if (Objects.isNull(userExam)) {
throw new RuntimeException("璇ュ鍛樿�冭瘯璁板綍涓嶅瓨鍦�");
}
- ExamVO exam = examMapper.getById(examId);
+ //濡傛灉宸茬粡闃呰繃鍗蜂簡锛屾煡鎴愮哗琛�
+ Result<ExamPaperMarkVO> paperMarkVO1 = checkHasJudge(examId, userId, userExam);
+ if (paperMarkVO1 != null) return paperMarkVO1;
+
User student = userMapper.getUserById(userId);
+ ExamVO exam = examMapper.getById(examId);
//灏佽闃呭嵎鍩烘湰鏁版嵁
ExamPaperMarkVO paperMarkVO = createVO(userExam, exam, student);
- //TODO:琛ュ厖棰樼洰绛旀銆佽В鏋�
- List<PaperFixQuestionVO> titleItems = paperMarkVO.getTitleItems();
- for (PaperFixQuestionVO titleItem : titleItems) {
- for (DoQuestionVO doQuestionVO : titleItem.getQuestionList()) {
-
- }
- }
+ List<QuestionAnswerCopyVO> answerList = JSONArray.parseArray(userExam.getQuestionAnswerCopy(), QuestionAnswerCopyVO.class);
+ //琛ュ厖棰樼洰绛旀銆佽В鏋�
+ addAnswer(paperMarkVO, answerList);
//闃呭嵎锛屽瑙傞鎵撳垎
Result InnerError = markPaper(paperMarkVO);
if (InnerError != null) return InnerError;
return Result.ok(paperMarkVO);
}
- //鎻愪氦鎵规敼
- @Override
- @Transactional(rollbackFor = Exception.class)
- public Result submitMarkPaper(ExamPaperMarkVO examPaperMark) {
- Integer userId = webContext.getCurrentUser().getId();
- //鎻掑叆exam_paper_answer(鎴愮哗琛�)
- ExamPaperScore examPaperScore = new ExamPaperScore();
- BeanUtils.copyProperties(examPaperMark,examPaperScore);
- examPaperScore.setUserScore(new BigDecimal(examPaperMark.getScore()));
- examPaperScore.setPaperScore(new BigDecimal(examPaperMark.getTotalScore()));
- examPaperScore.setJudgeUser(userId);
- examPaperScore.setCreateUser(examPaperMark.getUserId());
- examPaperScore.setAnswerTime(examPaperMark.getSubmitTime());
- examPaperScore.setPaperContent(JSON.toJSONString(examPaperMark.getTitleItems()));
- long questionCorrect =0;
- long questionCount=0;
- if(!CollectionUtils.isEmpty(examPaperMark.getAnswers())){
- questionCorrect = examPaperMark.getAnswers().stream().filter(ExamPaperMarkAnswerVO::getRight).count();
- questionCount = examPaperMark.getAnswers().size();
+
+ //琛ュ厖棰樼洰绛旀銆佽В鏋�
+ private void addAnswer(ExamPaperMarkVO paperMarkVO, List<QuestionAnswerCopyVO> answerList) {
+ List<PaperFixQuestionVO> titleItems = paperMarkVO.getTitleItems();
+ for (PaperFixQuestionVO titleItem : titleItems) {
+ for (DoQuestionVO doQuestionVO : titleItem.getQuestionList()) {
+ Integer questionId = doQuestionVO.getId();
+ Optional<QuestionAnswerCopyVO> first = answerList.stream().filter(answer -> questionId.equals(answer.getId())).findFirst();
+ if (first.isPresent()) {
+ QuestionAnswerCopyVO answerCopyVO = first.get();
+ doQuestionVO.setQuestionAnswer(answerCopyVO.getCorrect());
+ doQuestionVO.setAnalyze(answerCopyVO.getAnalyze());
+ doQuestionVO.setDifficult(answerCopyVO.getDifficult());
+ }
+ }
}
- examPaperScore.setQuestionCorrect(Integer.valueOf(questionCorrect+""));
- examPaperScore.setQuestionCount(Integer.valueOf(questionCount+""));
- examPaperScoreMapper.insert(examPaperScore);
- return Result.ok();
}
+
+ //妫�鏌ユ槸鍚﹂槄鍗�
+ private Result<ExamPaperMarkVO> checkHasJudge(Integer examId, Integer userId, ExamSubmitTemp userExam) {
+ if (ExamSubmitTempStatusEnum.finish.equals(userExam.getMarkPaperStatus())) {
+ ExamPaperScore examPaperScore = examPaperScoreMapper.getByExamIdUserId(examId, userId);
+ ExamPaperMarkVO paperMarkVO = new ExamPaperMarkVO();
+ BeanUtils.copyProperties(examPaperScore, paperMarkVO);
+ paperMarkVO.setTotalScore(examPaperScore.getTotalScore() + "");
+ paperMarkVO.setScore(examPaperScore.getScore() + "");
+ List<PaperFixQuestionVO> paperFixQuestionVOS = JSONArray.parseArray(examPaperScore.getPaperContent(), PaperFixQuestionVO.class);
+ paperMarkVO.setTitleItems(paperFixQuestionVOS);
+ paperMarkVO.setNavbar(JSONArray.parseArray(examPaperScore.getNavbar(), ExamPaperMarkNavbarVO.class));
+ return Result.ok(paperMarkVO);
+ }
+ return null;
+ }
+
//闃呭嵎
private Result markPaper(ExamPaperMarkVO paperMarkVO) {
List<PaperFixQuestionVO> titleItems = paperMarkVO.getTitleItems();
//鍒濆鍖栭鐩簭鍙�
Integer num = 1;
- List<ExamPaperMarkAnswerVO> answers = new ArrayList<>();
+ BigDecimal score = BigDecimal.ZERO;
+ //鍓嶇瀵艰埅鏁扮粍
+ List<ExamPaperMarkNavbarVO> navbar = new ArrayList<>();
+ //杩囨护鎺夐鐩负绌虹殑棰樼洰绫诲瀷
+ titleItems = titleItems.stream().filter(paperFixQuestionVO -> !CollectionUtils.isEmpty(paperFixQuestionVO.getQuestionList())).collect(Collectors.toList());
+
for (PaperFixQuestionVO titleItem : titleItems) {
for (DoQuestionVO doQuestionVO : titleItem.getQuestionList()) {
//鍑嗗棰樼洰搴忓彿渚涘墠绔烦杞娇鐢�
- ExamPaperMarkAnswerVO answerVO = new ExamPaperMarkAnswerVO();
+ ExamPaperMarkNavbarVO navbarVO = new ExamPaperMarkNavbarVO();
//鑾峰彇璇曞嵎绫诲瀷
Integer questionType = doQuestionVO.getQuestionType();
/* 濡傛灉鏄畝绛斻�佽绠椼�佸垎鏋愶紝涓嶈缃畆ight鍙缃鐩簭鍙� */
if (QuestionTypeEnum.ShortAnswer.getCode().equals(questionType) || QuestionTypeEnum.Calculate.getCode().equals(questionType) || QuestionTypeEnum.Analysis.getCode().equals(questionType)) {
- answerVO.setItemOrder(num);
+ navbarVO.setItemOrder(num);
doQuestionVO.setItemOrder(num);
}
/* 濡傛灉鏄崟閫夈�佽闊炽�佸垽鏂�(鍒ゆ柇绛旀鏄疉銆丅) */
else if (QuestionTypeEnum.SingleChoice.getCode().equals(questionType) || QuestionTypeEnum.Audio.getCode().equals(questionType) || QuestionTypeEnum.TrueFalse.getCode().equals(questionType)) {
- answerVO.setItemOrder(num);
+ navbarVO.setItemOrder(num);
doQuestionVO.setItemOrder(num);
if (StringUtils.isEmpty(doQuestionVO.getQuestionAnswer())) {
- return Result.fail(SystemCode.InnerError.getCode(), doQuestionVO.getTitle() + ",姝ら鐩己灏戠瓟妗堬紝璇峰厛瀹屽杽");
+ return Result.fail(SystemCode.InnerError.getCode(), "棰樼洰id涓猴細" + doQuestionVO.getId() + "鐨勯鐩己灏戠瓟妗堬紝璇峰厛瀹屽杽");
}
- trueOrFalse(doQuestionVO, answerVO, doQuestionVO.getQuestionAnswer().equals(doQuestionVO.getAnswer()));
+ trueOrFalse(score,doQuestionVO, navbarVO, doQuestionVO.getQuestionAnswer().equals(doQuestionVO.getAnswer()));
}
/* 濡傛灉鏄閫� */
else if (QuestionTypeEnum.MultipleChoice.getCode().equals(questionType)) {
- answerVO.setItemOrder(num);
+ navbarVO.setItemOrder(num);
doQuestionVO.setItemOrder(num);
if (StringUtils.isEmpty(doQuestionVO.getQuestionAnswer())) {
- return Result.fail(SystemCode.InnerError.getCode(), doQuestionVO.getTitle() + ",姝ら鐩己灏戠瓟妗堬紝璇峰厛瀹屽杽");
+ return Result.fail(SystemCode.InnerError.getCode(), "棰樼洰id涓猴細" + doQuestionVO.getId() + "鐨勯鐩己灏戠瓟妗堬紝璇峰厛瀹屽杽");
}
//瀛︾敓绛旀
List<String> answerList = doQuestionVO.getAnswerList();
@@ -571,7 +612,9 @@
List<String> questionAnswerList = Arrays.asList(questionAnswer.split(","));
//瀛︾敓绛旀涓虹┖锛屽垽鏂负閿�
if (CollectionUtils.isEmpty(answerList)) {
- trueOrFalse(doQuestionVO, answerVO, false);
+ trueOrFalse(score,doQuestionVO, navbarVO, false);
+ num++;
+ navbar.add(navbarVO);
continue;
}
//绛旀鏁伴噺锛屼笉闇�瑕佽�冭檻椤哄簭
@@ -580,7 +623,9 @@
Set<String> set2 = new HashSet<>(questionAnswerList);
//绛旀瀹屽叏涓�鑷达紝婊″垎
if (set1.equals(set2)) {
- trueOrFalse(doQuestionVO, answerVO, true);
+ trueOrFalse(score,doQuestionVO, navbarVO, true);
+ num++;
+ navbar.add(navbarVO);
continue;
}
if (paperMarkVO.getDeductType() == null) {
@@ -588,18 +633,19 @@
}
//濡傛灉澶氶�夊緱鍒嗙被鍨嬩负 绛旈敊涓嶅緱鍒�
if (Integer.valueOf(DeductTypeEnum.AllCorrect.getCode()).equals(paperMarkVO.getDeductType())) {
- trueOrFalse(doQuestionVO, answerVO, false);
+ trueOrFalse(score,doQuestionVO, navbarVO, false);
}
//濡傛灉澶氶�夊緱鍒嗙被鍨嬩负 婕忛�夊緱鍥哄畾鍒嗗��,鍖呭惈閿欒閫夐」涓嶅緱鍒�
else if (Integer.valueOf(DeductTypeEnum.PartCorrect.getCode()).equals(paperMarkVO.getDeductType())) {
//瀛︾敓绛旀绉婚櫎鎵�鏈夋纭瓟妗堬紝濡傛灉杩樻湁鍏冪礌璇存槑鍖呭惈閿欒閫夐」
answerList.removeAll(questionAnswerList);
if (!CollectionUtils.isEmpty(answerList)) {
- trueOrFalse(doQuestionVO, answerVO, false);
+ trueOrFalse(score,doQuestionVO, navbarVO, false);
} else {
- answerVO.setRight(false);
+ navbarVO.setRight(false);
doQuestionVO.setRight(false);
//婕忛�夊緱鍥哄畾鍒�
+ score = score.add(paperMarkVO.getDeductScore());
doQuestionVO.setScore(paperMarkVO.getDeductScore());
}
}
@@ -608,9 +654,9 @@
//瀛︾敓绛旀绉婚櫎鎵�鏈夋纭瓟妗堬紝濡傛灉杩樻湁鍏冪礌璇存槑鍖呭惈閿欒閫夐」
answerList.removeAll(questionAnswerList);
if (!CollectionUtils.isEmpty(answerList)) {
- trueOrFalse(doQuestionVO, answerVO, false);
+ trueOrFalse(score,doQuestionVO, navbarVO, false);
} else {
- answerVO.setRight(false);
+ navbarVO.setRight(false);
doQuestionVO.setRight(false);
//婕忛�夊緱鍒�
doQuestionVO.setScore(paperMarkVO.getDeductScore().multiply(new BigDecimal(answerCount)));
@@ -619,10 +665,10 @@
}
/* 濡傛灉鏄～绌� */
else if (QuestionTypeEnum.GapFilling.getCode().equals(questionType)) {
- answerVO.setItemOrder(num);
+ navbarVO.setItemOrder(num);
doQuestionVO.setItemOrder(num);
if (StringUtils.isEmpty(doQuestionVO.getQuestionAnswer())) {
- return Result.fail(SystemCode.InnerError.getCode(), doQuestionVO.getTitle() + ",姝ら鐩己灏戠瓟妗堬紝璇峰厛瀹屽杽");
+ return Result.fail(SystemCode.InnerError.getCode(), "棰樼洰id涓猴細" + doQuestionVO.getId() + "鐨勯鐩己灏戠瓟妗堬紝璇峰厛瀹屽杽");
}
//瀛︾敓绛旀
List<String> answerList = doQuestionVO.getAnswerList();
@@ -631,21 +677,23 @@
List<String> questionAnswerList = Arrays.asList(questionAnswer.split(","));
//瀛︾敓绛旀涓虹┖锛屽垽鏂负閿�
if (CollectionUtils.isEmpty(answerList)) {
- trueOrFalse(doQuestionVO, answerVO, false);
+ trueOrFalse(score,doQuestionVO, navbarVO, false);
+ num++;
+ navbar.add(navbarVO);
continue;
}
//鎬荤┖鐨勬暟閲�
int questionAnswerCount = questionAnswerList.size();
//绛旀瀹屽叏涓�鑷达紝婊″垎
if (answerList.equals(questionAnswerList)) {
- trueOrFalse(doQuestionVO, answerVO, true);
+ trueOrFalse(score,doQuestionVO, navbarVO, true);
} else {
- answerVO.setRight(false);
+ navbarVO.setRight(false);
doQuestionVO.setRight(false);
//鍋氬鐨勬暟閲�,闇�瑕佹寜椤哄簭姣旇緝
int count = 0;
for (int i = 0; i < answerList.size(); i++) {
- if(answerList.get(i).equals(questionAnswerList.get(i))){
+ if (answerList.get(i).equals(questionAnswerList.get(i))) {
count++;
}
}
@@ -653,29 +701,32 @@
BigDecimal questionScore = doQuestionVO.getQuestionScore();
//姣忎釜绌虹殑鍒嗘暟
BigDecimal scoreEach = questionScore.divide(new BigDecimal(questionAnswerCount), 1, RoundingMode.DOWN);
- BigDecimal score = scoreEach.multiply(new BigDecimal(count));
- doQuestionVO.setScore(score);
+ //濉┖寰楀垎
+ BigDecimal gapScore = scoreEach.multiply(new BigDecimal(count));
+ doQuestionVO.setScore(gapScore);
}
}
num++;
- answers.add(answerVO);
+ navbar.add(navbarVO);
}
}
- paperMarkVO.setAnswers(answers);
+ paperMarkVO.setTitleItems(titleItems);
+ paperMarkVO.setNavbar(navbar);
return null;
}
//璁剧疆鍏ㄥ鎴栧叏閿�
- private void trueOrFalse(DoQuestionVO doQuestionVO, ExamPaperMarkAnswerVO answerVO, Boolean isCorrect) {
+ private void trueOrFalse(BigDecimal score,DoQuestionVO doQuestionVO, ExamPaperMarkNavbarVO orderVO, Boolean isCorrect) {
if (isCorrect) {
//姝ｇ‘
- answerVO.setRight(isCorrect);
+ orderVO.setRight(isCorrect);
doQuestionVO.setRight(isCorrect);
doQuestionVO.setScore(doQuestionVO.getQuestionScore());
+ score = score.add(doQuestionVO.getQuestionScore());
} else {
//閿欒
- answerVO.setRight(isCorrect);
+ orderVO.setRight(isCorrect);
doQuestionVO.setRight(isCorrect);
doQuestionVO.setScore(BigDecimal.ZERO);
}
@@ -683,21 +734,56 @@
//灏佽闃呭嵎杩斿洖鏁版嵁
private ExamPaperMarkVO createVO(ExamSubmitTemp userExam, ExamVO exam, User student) {
+ Integer paperId = exam.getExamPaperId();
+ ExamPaper examPaper = examPaperMapper.selectById(paperId);
ExamPaperMarkVO paperMarkVO = new ExamPaperMarkVO();
BeanUtils.copyProperties(userExam, paperMarkVO);
paperMarkVO.setPaperId(exam.getExamPaperId());
- //TODO: 璇曞嵎鎬诲垎銆�(澶氶�夊緱鍒嗙被鍨嬨�佸閫夊緱鍒嗗垎鏁�)闇�瑕佸彇ExamSubmitTemp
paperMarkVO.setExamName(exam.getExamName());
paperMarkVO.setPaperType(exam.getExamPaperType());
paperMarkVO.setSubmitTime(userExam.getUpdateTime());
paperMarkVO.setUserName(student.getRealName());
paperMarkVO.setTitleItems(JSON.parseArray(userExam.getExamSubmit(), PaperFixQuestionVO.class));
- paperMarkVO.setTotalScore("100");
- paperMarkVO.setDeductType(DeductTypeEnum.AllCorrect.getCode());
- paperMarkVO.setDeductScore(BigDecimal.ZERO);
+ paperMarkVO.setTotalScore(examPaper.getScore() + "");
+ paperMarkVO.setDeductType(examPaper.getDeductType());
+ paperMarkVO.setDeductScore(examPaper.getDeductTypeScore());
return paperMarkVO;
}
+ //鎻愪氦鎵规敼
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result submitMarkPaper(ExamPaperMarkVO examPaperMark) {
+ Integer userId = webContext.getCurrentUser().getId();
+ //鎻掑叆exam_paper_answer(鎴愮哗琛�)
+ ExamPaperScore examPaperScore = new ExamPaperScore();
+ BeanUtils.copyProperties(examPaperMark, examPaperScore);
+ examPaperScore.setScore(new BigDecimal(examPaperMark.getScore()));
+ examPaperScore.setTotalScore(new BigDecimal(examPaperMark.getTotalScore()));
+ examPaperScore.setJudgeUser(userId);
+ examPaperScore.setJudgeTime(new Date());
+ examPaperScore.setPaperContent(JSON.toJSONString(examPaperMark.getTitleItems()));
+ examPaperScore.setNavbar(JSON.toJSONString(examPaperMark.getNavbar()));
+ long questionCorrect = 0;
+ long questionCount = 0;
+ if (!CollectionUtils.isEmpty(examPaperMark.getNavbar())) {
+ questionCorrect = examPaperMark.getNavbar().stream().filter(ExamPaperMarkNavbarVO::getRight).count();
+ questionCount = examPaperMark.getNavbar().size();
+ }
+ examPaperScore.setQuestionCorrect(Integer.valueOf(questionCorrect + ""));
+ examPaperScore.setQuestionCount(Integer.valueOf(questionCount + ""));
+ //鎵句箣鍓嶆湁鏃犳壒鏀硅褰�
+ ExamPaperScore score = examPaperScoreMapper.getByExamIdUserId(examPaperMark.getExamId(), examPaperMark.getUserId());
+ if (score != null) {
+ examPaperScore.setId(score.getId());
+ examPaperScoreMapper.updateById(examPaperScore);
+ } else {
+ examPaperScoreMapper.insert(examPaperScore);
+ }
+ return Result.ok();
+ }
+
+
@Override
public Result monitorList(ExamQuery query) {
IPage<ExamSubmitTempVO> page = PageUtil.getPage(query, ExamSubmitTempVO.class);
--
Gitblit v1.8.0