From d4fbcb148c6d141caceb8c0bbab7255084399584 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期五, 14 六月 2024 17:19:49 +0800
Subject: [PATCH] fix：题型问题解决
---
src/main/resources/mapper/QuestionMapper.xml | 2 ++
src/main/java/com/ycl/jxkg/enums/QuestionTypeEnum.java | 4 +++-
src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java | 3 +++
src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java | 40 ++++++++++++++++------------------------
4 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/enums/QuestionTypeEnum.java b/src/main/java/com/ycl/jxkg/enums/QuestionTypeEnum.java
index d7b9232..2be650a 100644
--- a/src/main/java/com/ycl/jxkg/enums/QuestionTypeEnum.java
+++ b/src/main/java/com/ycl/jxkg/enums/QuestionTypeEnum.java
@@ -10,7 +10,9 @@
TrueFalse(3, "鍒ゆ柇棰�"),
GapFilling(4, "濉┖棰�"),
ShortAnswer(5, "绠�绛旈"),
- Calculation(6,"璁＄畻棰�");
+ Audio(6,"璇煶棰�"),
+ Calculate(7,"璁＄畻棰�"),
+ Analysis(8,"鍒嗘瀽棰�");
Integer code;
String name;
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
index 4da4b71..5251e1e 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
@@ -1,21 +1,29 @@
package com.ycl.jxkg.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.jxkg.domain.entity.ExamTemplate;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
import com.ycl.jxkg.context.WebContext;
+import com.ycl.jxkg.domain.entity.ExamPaper;
+import com.ycl.jxkg.domain.entity.ExamTemplate;
import com.ycl.jxkg.domain.entity.TextContent;
-import com.ycl.jxkg.domain.exam.ExamPaperTempDTO;
-import com.ycl.jxkg.domain.form.ExamPaperForm;
-import com.ycl.jxkg.domain.question.TemplateQuestionDTO;
-import com.ycl.jxkg.domain.vo.admin.exam.ExamResponseVO;
-import com.ycl.jxkg.enums.ExamPaperTypeEnum;
+import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.domain.exam.ExamPaperQuestionItemObject;
+import com.ycl.jxkg.domain.exam.ExamPaperTempDTO;
import com.ycl.jxkg.domain.exam.ExamPaperTitleItemObject;
+import com.ycl.jxkg.domain.form.ExamPaperForm;
import com.ycl.jxkg.domain.other.KeyValue;
+import com.ycl.jxkg.domain.question.TemplateQuestionDTO;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperTitleItemVO;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamResponseVO;
+import com.ycl.jxkg.domain.vo.student.dashboard.PaperFilter;
+import com.ycl.jxkg.domain.vo.student.dashboard.PaperInfo;
+import com.ycl.jxkg.domain.vo.student.exam.ExamPaperPageVO;
+import com.ycl.jxkg.enums.ExamPaperTypeEnum;
import com.ycl.jxkg.enums.QuestionTypeEnum;
-import com.ycl.jxkg.enums.VisibilityEnum;
import com.ycl.jxkg.enums.VisibilityEnum;
import com.ycl.jxkg.mapper.ExamPaperMapper;
import com.ycl.jxkg.mapper.ExamTemplateMapper;
@@ -27,16 +35,6 @@
import com.ycl.jxkg.service.enums.ActionEnum;
import com.ycl.jxkg.utils.DateTimeUtil;
import com.ycl.jxkg.utils.JsonUtil;
-import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO;
-import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO;
-import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperTitleItemVO;
-import com.ycl.jxkg.domain.vo.student.dashboard.PaperFilter;
-import com.ycl.jxkg.domain.vo.student.dashboard.PaperInfo;
-import com.ycl.jxkg.domain.vo.student.exam.ExamPaperPageVO;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import com.ycl.jxkg.domain.entity.ExamPaper;
-import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.utils.PageInfoHelper;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
@@ -116,11 +114,6 @@
examTemplate.setShortAnswer(dto.getNum());
examTemplate.setShortAnswerScore(dto.getScore());
break;
- //璁＄畻
- case Calculation:
- examTemplate.setCalculation(dto.getNum());
- examTemplate.setCalculationScore(dto.getScore());
- break;
}
}
examTemplate.setExamPaperId(examPaper.getId());
@@ -160,7 +153,6 @@
addQuestionList(questionList, QuestionTypeEnum.TrueFalse.getCode(), examTemplate.getTrueFalseScore(), examTemplate.getTrueFalse());
addQuestionList(questionList, QuestionTypeEnum.GapFilling.getCode(), examTemplate.getGapScore(), examTemplate.getGapFilling());
addQuestionList(questionList, QuestionTypeEnum.ShortAnswer.getCode(), examTemplate.getShortAnswerScore(), examTemplate.getShortAnswer());
- addQuestionList(questionList, QuestionTypeEnum.Calculation.getCode(), examTemplate.getCalculationScore(), examTemplate.getCalculation());
vo.setQuestionList(questionList);
}
return vo;
diff --git a/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
index 9e6a0d2..4a737c4 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/QuestionServiceImpl.java
@@ -105,6 +105,7 @@
switch (questionTypeEnum) {
case SingleChoice:
case TrueFalse:
+ case Audio:
questionEditRequestVO.setCorrect(question.getCorrect());
break;
case MultipleChoice:
@@ -115,6 +116,8 @@
questionEditRequestVO.setCorrectArray(correctContent);
break;
case ShortAnswer:
+ case Calculate:
+ case Analysis:
questionEditRequestVO.setCorrect(questionObject.getCorrect());
break;
default:
diff --git a/src/main/resources/mapper/QuestionMapper.xml b/src/main/resources/mapper/QuestionMapper.xml
index 80ee354..7c3da50 100644
--- a/src/main/resources/mapper/QuestionMapper.xml
+++ b/src/main/resources/mapper/QuestionMapper.xml
@@ -29,6 +29,8 @@
WHEN tq.question_type = 4 THEN '濉┖棰�'
WHEN tq.question_type = 5 THEN '绠�绛旈'
WHEN tq.question_type = 6 THEN '璇煶棰�'
+ WHEN tq.question_type = 7 THEN '璁＄畻棰�'
+ WHEN tq.question_type = 8 THEN '鍒嗘瀽棰�'
END AS questionTypeName,
ts.name AS subjectName,
tu.real_name AS createUserName
--
Gitblit v1.8.0