From 3b59408f8da4c87da5aacd29cd1b7b0f2575b5ad Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 10 七月 2024 18:03:15 +0800
Subject: [PATCH] 阅卷缺考
---
src/main/java/com/ycl/jxkg/constants/ExamScoreConstant.java | 22 +++++++++++
src/main/java/com/ycl/jxkg/domain/entity/ExamPaperScore.java | 2
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 85 ++++++++++++++++++++++++++++--------------
3 files changed, 79 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/constants/ExamScoreConstant.java b/src/main/java/com/ycl/jxkg/constants/ExamScoreConstant.java
new file mode 100644
index 0000000..e066f5b
--- /dev/null
+++ b/src/main/java/com/ycl/jxkg/constants/ExamScoreConstant.java
@@ -0,0 +1,22 @@
+package com.ycl.jxkg.constants;
+
+/**
+ * 鎴愮哗鐘舵��
+ *
+ * @author锛歠lq
+ * @date锛�2024/7/10 11:36
+ */
+public class ExamScoreConstant {
+
+ /**
+ * 鑰冧簡
+ *
+ */
+ public final static Integer PRESENT = 0;
+
+ /**
+ * 缂鸿��
+ *
+ */
+ public final static Integer ABSENT =1;
+}
diff --git a/src/main/java/com/ycl/jxkg/domain/entity/ExamPaperScore.java b/src/main/java/com/ycl/jxkg/domain/entity/ExamPaperScore.java
index 738eb93..e3eff2b 100644
--- a/src/main/java/com/ycl/jxkg/domain/entity/ExamPaperScore.java
+++ b/src/main/java/com/ycl/jxkg/domain/entity/ExamPaperScore.java
@@ -62,7 +62,7 @@
private Integer doTime;
/**
- * 璇曞嵎鐘舵��(1寰呭垽鍒� 2瀹屾垚)
+ * 璇曞嵎鐘舵��(0姝ｅ父 1缂鸿��)
*/
@TableField("status")
private Integer status;
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 98b9c3a..6b4790c 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.base.SystemCode;
+import com.ycl.jxkg.constants.ExamScoreConstant;
import com.ycl.jxkg.context.WebContext;
import com.ycl.jxkg.domain.base.AbsVo;
import com.ycl.jxkg.domain.entity.*;
@@ -561,12 +562,12 @@
for (StudentExamInfoVO studentExamInfoVO : studentExamList) {
Integer userId = studentExamInfoVO.getUserId();
Optional<ExamSubmitTemp> first = examSubmitTempList.stream().filter(examSubmitTemp -> examSubmitTemp.getUserId().equals(userId)).findFirst();
- if(first.isPresent()){
+ if (first.isPresent()) {
ExamSubmitTemp examSubmitTemp = first.get();
studentExamInfoVO.setMarkPaperStatus(examSubmitTemp.getMarkPaperStatus());
studentExamInfoVO.setStatus(examSubmitTemp.getStatus());
studentExamInfoVO.setDoTime(examSubmitTemp.getDoTime());
- }else {
+ } else {
studentExamInfoVO.setMarkPaperStatus(ExamSubmitTempStatusEnum.temp);
studentExamInfoVO.setStatus(ExamSubmitTempStatusEnum.temp);
studentExamInfoVO.setDoTime(0);
@@ -589,20 +590,22 @@
@Override
public Result getMarkPaperInfo(Integer examId, Integer userId) {
+ //濡傛灉宸茬粡闃呰繃鍗蜂簡锛屾煡鎴愮哗琛�
+ Result<ExamPaperMarkVO> paperMarkVO1 = checkHasJudge(examId, userId);
+ if (paperMarkVO1 != null) return paperMarkVO1;
+
+ User student = userMapper.getUserById(userId);
+ ExamVO exam = examMapper.getById(examId);
//瀛︾敓绛旈琛�
ExamSubmitTemp userExam = new LambdaQueryChainWrapper<>(examSubmitTempMapper)
.eq(ExamSubmitTemp::getExamId, examId)
.eq(ExamSubmitTemp::getUserId, userId)
.one();
if (Objects.isNull(userExam)) {
- throw new RuntimeException("璇ュ鍛樿�冭瘯璁板綍涓嶅瓨鍦�");
+ //缂鸿�冿紝瀛︾敓娌℃湁鍋氶淇℃伅
+ ExamPaperMarkVO paperMarkVO = createVO(null, exam, student);
+ return Result.ok(paperMarkVO);
}
- //濡傛灉宸茬粡闃呰繃鍗蜂簡锛屾煡鎴愮哗琛�
- 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);
List<QuestionAnswerCopyVO> answerList = JSONArray.parseArray(userExam.getQuestionAnswerCopy(), QuestionAnswerCopyVO.class);
@@ -633,16 +636,20 @@
}
//妫�鏌ユ槸鍚﹂槄鍗�
- private Result<ExamPaperMarkVO> checkHasJudge(Integer examId, Integer userId, ExamSubmitTemp userExam) {
- if (ExamSubmitTempStatusEnum.finish.equals(userExam.getMarkPaperStatus())) {
- ExamPaperScore examPaperScore = examPaperScoreMapper.getByExamIdUserId(examId, userId);
+ private Result<ExamPaperMarkVO> checkHasJudge(Integer examId, Integer userId) {
+ ExamPaperScore examPaperScore = examPaperScoreMapper.getByExamIdUserId(examId, userId);
+ if (examPaperScore != null) {
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));
+ if (!StringUtils.isEmpty(examPaperScore.getPaperContent())) {
+ List<PaperFixQuestionVO> paperFixQuestionVOS = JSONArray.parseArray(examPaperScore.getPaperContent(), PaperFixQuestionVO.class);
+ paperMarkVO.setTitleItems(paperFixQuestionVOS);
+ }
+ if (!StringUtils.isEmpty(examPaperScore.getNavbar())) {
+ paperMarkVO.setNavbar(JSONArray.parseArray(examPaperScore.getNavbar(), ExamPaperMarkNavbarVO.class));
+ }
return Result.ok(paperMarkVO);
}
return null;
@@ -820,16 +827,23 @@
//灏佽闃呭嵎杩斿洖鏁版嵁
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());
- paperMarkVO.setExamName(exam.getExamName());
- paperMarkVO.setPaperType(exam.getExamPaperType());
- paperMarkVO.setSubmitTime(userExam.getUpdateTime());
+ if (userExam != null) {
+ BeanUtils.copyProperties(userExam, paperMarkVO);
+ paperMarkVO.setSubmitTime(userExam.getUpdateTime());
+ paperMarkVO.setTitleItems(JSON.parseArray(userExam.getExamSubmit(), PaperFixQuestionVO.class));
+ } else {
+ //缂鸿�冿紝瀛︾敓娌℃湁鍋氶淇℃伅
+ paperMarkVO.setExamId(exam.getExamPaperId());
+ paperMarkVO.setUserId(student.getId());
+ paperMarkVO.setScore(BigDecimal.ZERO + "");
+ paperMarkVO.setDoTime(0);
+ }
paperMarkVO.setUserName(student.getRealName());
- paperMarkVO.setTitleItems(JSON.parseArray(userExam.getExamSubmit(), PaperFixQuestionVO.class));
+ paperMarkVO.setExamName(exam.getExamName());
+ paperMarkVO.setPaperId(exam.getExamPaperId());
+ paperMarkVO.setPaperType(exam.getExamPaperType());
+ ExamPaper examPaper = examPaperMapper.selectById(exam.getExamPaperId());
paperMarkVO.setTotalScore(examPaper.getScore() + "");
paperMarkVO.setDeductType(examPaper.getDeductType());
paperMarkVO.setDeductScore(examPaper.getDeductTypeScore());
@@ -848,13 +862,24 @@
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()));
+ if (!StringUtils.isEmpty(examPaperMark.getTitleItems())) {
+ examPaperScore.setPaperContent(JSON.toJSONString(examPaperMark.getTitleItems()));
+ }
+ if (!StringUtils.isEmpty(examPaperMark.getNavbar())) {
+ examPaperScore.setNavbar(JSON.toJSONString(examPaperMark.getNavbar()));
+ }
long questionCorrect = 0;
long questionCount = 0;
if (!CollectionUtils.isEmpty(examPaperMark.getNavbar())) {
+ examPaperScore.setStatus(ExamScoreConstant.PRESENT);
questionCorrect = examPaperMark.getNavbar().stream().filter(vo -> vo.getRight() != null && vo.getRight()).count();
questionCount = examPaperMark.getNavbar().size();
+ } else {
+ //缂鸿�冩煡璇曞嵎閰嶇疆
+ Integer paperId = examPaperMark.getPaperId();
+ ExamPaper examPaper = examPaperMapper.selectById(paperId);
+ questionCount = examPaper.getNum();
+ examPaperScore.setStatus(ExamScoreConstant.ABSENT);
}
examPaperScore.setQuestionCorrect(Integer.valueOf(questionCorrect + ""));
examPaperScore.setQuestionCount(Integer.valueOf(questionCount + ""));
@@ -870,8 +895,10 @@
.eq(ExamSubmitTemp::getExamId, examPaperMark.getExamId())
.eq(ExamSubmitTemp::getUserId, examPaperMark.getUserId())
.one();
- userExam.setMarkPaperStatus(ExamSubmitTempStatusEnum.finish);
- examSubmitTempMapper.updateById(userExam);
+ if (userExam != null) {
+ userExam.setMarkPaperStatus(ExamSubmitTempStatusEnum.finish);
+ examSubmitTempMapper.updateById(userExam);
+ }
}
return Result.ok();
}
@@ -885,7 +912,7 @@
@Override
public Result addTime(AddTimeForm form) {
- if (! websocketServer.checkUserOnline(form.getUserId())) {
+ if (!websocketServer.checkUserOnline(form.getUserId())) {
throw new RuntimeException("璇ュ鍛樹笉鍦ㄧ嚎锛屾棤娉曟墽琛岃鎿嶄綔");
}
WebsocketDataVO websocket = new WebsocketDataVO();
@@ -900,7 +927,7 @@
@Override
public Result forceSubmit(ForceSubmitForm form) {
- if (! websocketServer.checkUserOnline(form.getUserId())) {
+ if (!websocketServer.checkUserOnline(form.getUserId())) {
throw new RuntimeException("璇ュ鍛樹笉鍦ㄧ嚎锛屾棤娉曟墽琛岃鎿嶄綔");
}
WebsocketDataVO websocket = new WebsocketDataVO();
--
Gitblit v1.8.0