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/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java | 40 ++++++++++++++++------------------------ 1 files changed, 16 insertions(+), 24 deletions(-) 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; -- Gitblit v1.8.0