From bab46ea30e5b744183024c0afb944378bb04c744 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 28 六月 2024 10:34:09 +0800
Subject: [PATCH] 参加过考试直接返回数据
---
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 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 cb54732..09ed294 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -165,6 +165,20 @@
if (Objects.isNull(examPaper)) {
throw new RuntimeException("璇曞嵎涓嶅瓨鍦�");
}
+ // 濡傛灉宸茬粡鍙傚姞杩囪�冭瘯锛岀洿鎺ヨ繑鍥炴暟鎹�
+ ExamSubmitTemp hasJoin = new LambdaQueryChainWrapper<>(examSubmitTempMapper)
+ .eq(ExamSubmitTemp::getExamId, id)
+ .eq(ExamSubmitTemp::getUserId, webContext.getCurrentUser().getId())
+ .one();
+ if (Objects.nonNull(hasJoin)) {
+ StartExamVO startExamVO = new StartExamVO();
+ startExamVO.setExamName(exam.getExamName());
+ startExamVO.setId(hasJoin.getExamId());
+ startExamVO.setTitleList(JSON.parseArray(hasJoin.getExamSubmit(), PaperFixQuestionVO.class));
+ startExamVO.setSuggestTime(examPaper.getSuggestTime());
+ startExamVO.setDoTime(hasJoin.getDoTime());
+ return Result.ok(startExamVO);
+ }
// 灏嗛鐩浆鎹负鍙复鏃朵繚瀛樼殑棰樼洰缁撴瀯銆傚浐瀹氳瘯鍗峰拰闅忓簭璇曞嵎鐨勯鐩槸鐩存帴淇濆瓨鍒癱ontent瀛楁鐨�
if (ExamPaperTypeEnum.Fixed.getCode().equals(examPaper.getPaperType())
|| ExamPaperTypeEnum.RandomOrder.getCode().equals(examPaper.getPaperType())) {
@@ -217,7 +231,12 @@
examSubmitTemp.setUserId(webContext.getCurrentUser().getId());
examSubmitTemp.setMarkPaperStatus(ExamSubmitTempStatusEnum.TEMP);
examSubmitTempMapper.insert(examSubmitTemp);
- return Result.ok(examData);
+ StartExamVO startExamVO = new StartExamVO();
+ startExamVO.setExamName(exam.getExamName());
+ startExamVO.setId(exam.getId());
+ startExamVO.setTitleList(examData);
+ startExamVO.setSuggestTime(examPaper.getSuggestTime());
+ return Result.ok(startExamVO);
}
return Result.ok();
}
@@ -290,9 +309,9 @@
* @return
*/
@Override
- public Result examSubmit(ExamSubmitVO submitData) {
+ public Result examSubmit(StartExamVO submitData) {
// 鏍￠獙
- Exam exam = examMapper.selectById(submitData.getExamId());
+ Exam exam = examMapper.selectById(submitData.getId());
if (Objects.isNull(exam)) {
throw new RuntimeException("璇ヨ�冭瘯涓嶅瓨鍦�");
}
@@ -335,7 +354,7 @@
* @return
*/
@Override
- public Result timingSubmit(ExamSubmitVO submitData) {
+ public Result timingSubmit(StartExamVO submitData) {
saveTempExam(submitData, ExamSubmitTempStatusEnum.TEMP);
return Result.ok();
}
@@ -346,9 +365,9 @@
* @param submitData 鍓嶇浼犻�掔殑璇曞嵎鏁版嵁
* @param status 璇曞嵎鐨勭姸鎬�
*/
- public void saveTempExam(ExamSubmitVO submitData, ExamSubmitTempStatusEnum status) {
+ public void saveTempExam(StartExamVO submitData, ExamSubmitTempStatusEnum status) {
ExamSubmitTemp one = new LambdaQueryChainWrapper<>(examSubmitTempMapper)
- .eq(ExamSubmitTemp::getExamId, submitData.getExamId())
+ .eq(ExamSubmitTemp::getExamId, submitData.getId())
.eq(ExamSubmitTemp::getUserId, webContext.getCurrentUser().getId())
.one();
if (Objects.nonNull(one)) {
@@ -356,17 +375,17 @@
return;
}
one.setDoTime(submitData.getDoTime());
- one.setExamSubmit(JSON.toJSONString(submitData.getPaperQuestionList()));
+ one.setExamSubmit(JSON.toJSONString(submitData.getTitleList()));
one.setCreateTime(new Date());
one.setStatus(status);
examSubmitTempMapper.updateById(one);
} else {
ExamSubmitTemp examSubmitTemp = new ExamSubmitTemp();
- examSubmitTemp.setExamId(submitData.getExamId());
+ examSubmitTemp.setExamId(submitData.getId());
examSubmitTemp.setDoTime(submitData.getDoTime());
examSubmitTemp.setStatus(status);
examSubmitTemp.setUserId(webContext.getCurrentUser().getId());
- examSubmitTemp.setExamSubmit(JSON.toJSONString(submitData.getPaperQuestionList()));
+ examSubmitTemp.setExamSubmit(JSON.toJSONString(submitData.getTitleList()));
examSubmitTemp.setMarkPaperStatus(ExamSubmitTempStatusEnum.TEMP);
examSubmitTempMapper.insert(examSubmitTemp);
}
@@ -436,7 +455,7 @@
@Override
public Result monitorList(ExamQuery query) {
IPage<ExamSubmitTempVO> page = PageUtil.getPage(query, ExamSubmitTempVO.class);
- return Result.ok().data(examSubmitTempMapper.monitorList(page, query));
+ return Result.ok((examSubmitTempMapper.monitorList(page, query)));
}
@Override
--
Gitblit v1.8.0