From 9b8264bd45b103476e2f9d662aa8c324a41f3357 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 12 六月 2024 09:10:46 +0800 Subject: [PATCH] 试卷逻辑更改 --- src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java | 133 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 126 insertions(+), 7 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 f661b55..0d99bb1 100644 --- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java +++ b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java @@ -1,12 +1,21 @@ package com.ycl.jxkg.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +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.exam.ExamPaperQuestionItemObject; import com.ycl.jxkg.domain.exam.ExamPaperTitleItemObject; import com.ycl.jxkg.domain.other.KeyValue; +import com.ycl.jxkg.enums.QuestionTypeEnum; +import com.ycl.jxkg.enums.VisibilityEnum; import com.ycl.jxkg.mapper.ExamPaperMapper; +import com.ycl.jxkg.mapper.ExamTemplateMapper; import com.ycl.jxkg.mapper.QuestionMapper; import com.ycl.jxkg.service.ExamPaperService; import com.ycl.jxkg.service.QuestionService; @@ -25,11 +34,14 @@ 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; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; @@ -44,14 +56,119 @@ private final TextContentService textContentService; private final QuestionService questionService; private final SubjectService subjectService; - + private final ExamTemplateMapper examTemplateMapper; @Override - public PageInfo<ExamPaper> page(ExamPaperPageRequestVO requestVM) { - return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() -> - examPaperMapper.page(requestVM)); + @Transactional(rollbackFor = Exception.class) + public void addPaper(ExamPaperForm form) { + ExamPaper examPaper = ExamPaperForm.getEntityByForm(form,null); + baseMapper.insert(examPaper); + if(ExamPaperTypeEnum.Random.getCode().equals(form.getPaperType())){ + ExamTemplate examTemplate = getExamTemplate(form, examPaper); + examTemplateMapper.insert(examTemplate); + baseMapper.updateById(examPaper); + } + //TODO:闅忓簭璇曞嵎鐢熸垚棰樼洰 + } + private ExamTemplate getExamTemplate(ExamPaperForm form, ExamPaper examPaper) { + //闅忔満璇曞嵎瀛樻ā鏉� + List<TemplateQuestionDTO> questionList = form.getQuestionList(); + BigDecimal score = BigDecimal.ZERO; + Integer num=0; + ExamTemplate examTemplate = new ExamTemplate(); + //璁剧疆棰樼洰淇℃伅 + for (TemplateQuestionDTO dto : questionList) { + num += dto.getNum(); + score = score.add(dto.getScore().multiply(BigDecimal.valueOf(dto.getNum()))); + Integer questionType = dto.getQuestionType(); + //鏁寸悊List涓哄璞� + switch (QuestionTypeEnum.fromCode(questionType)){ + //鍗曢�� + case SingleChoice: + examTemplate.setSingleChoice(dto.getNum()); + examTemplate.setSingleScore(dto.getScore()); + break; + //澶氶�� + case MultipleChoice: + examTemplate.setMultipleChoice(dto.getNum()); + examTemplate.setMultipleScore(dto.getScore()); + break; + //鍒ゆ柇 + case TrueFalse: + examTemplate.setTrueFalse(dto.getNum()); + examTemplate.setTrueFalseScore(dto.getScore()); + break; + //濉┖ + case GapFilling: + examTemplate.setGapFilling(dto.getNum()); + examTemplate.setGapScore(dto.getScore()); + break; + //绠�绛� + case ShortAnswer: + examTemplate.setShortAnswer(dto.getNum()); + examTemplate.setShortAnswerScore(dto.getScore()); + break; + //璁$畻 + case Calculation: + examTemplate.setCalculation(dto.getNum()); + examTemplate.setCalculationScore(dto.getScore()); + break; + } + } + examTemplate.setExamPaperId(examPaper.getId()); + //鍥炲~ + examPaper.setQuestionCount(num); + examPaper.setScore(score); + return examTemplate; + } + + @Override + public void updateExamPaper(ExamPaperForm form) { + ExamPaper entity = ExamPaperForm.getEntityByForm(form,null); + //濡傛灉鏄殢鏈鸿瘯鍗蜂慨鏀箃emplate琛� + if(ExamPaperTypeEnum.Random.getCode().equals(form.getPaperType())){ + ExamTemplate examTemplate = getExamTemplate(form, entity); + examTemplateMapper.removeById(form.getId()); + examTemplateMapper.insert(examTemplate); + } + baseMapper.updateById(entity); + } + + @Override + public PageInfo<ExamResponseVO> page(ExamPaperPageRequestVO requestVM) { + PageInfo<ExamPaperTempDTO> page = PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() -> + examPaperMapper.page(requestVM)); + PageInfo<ExamResponseVO> pageVO = PageInfoHelper.copyMap(page, e -> { + ExamResponseVO vo = new ExamResponseVO(); + BeanUtils.copyProperties(e, vo); + vo.setVisibility(VisibilityEnum.valueOf(vo.getVisibility()).getCode() + ""); + vo.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime())); + if(ExamPaperTypeEnum.Random.getCode().equals(e.getPaperType())) { + //鏁寸悊棰樼洰淇℃伅涓洪泦鍚� + ExamTemplate examTemplate = e.getExamTemplate(); + List<TemplateQuestionDTO> questionList = new ArrayList<>(); + addQuestionList(questionList, QuestionTypeEnum.SingleChoice.getCode(), examTemplate.getSingleScore(), examTemplate.getSingleChoice()); + addQuestionList(questionList, QuestionTypeEnum.MultipleChoice.getCode(), examTemplate.getMultipleScore(), examTemplate.getMultipleChoice()); + 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; + }); + return pageVO; + } + + private void addQuestionList(List<TemplateQuestionDTO> questionList, Integer code,BigDecimal score,Integer num) { + TemplateQuestionDTO questionDTO = new TemplateQuestionDTO(); + questionDTO.setQuestionType(code); + questionDTO.setScore(score); + questionDTO.setNum(num); + questionList.add(questionDTO); + } @Override public PageInfo<ExamPaper> taskExamPage(ExamPaperPageRequestVO requestVM) { return PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() -> @@ -87,7 +204,7 @@ examPaperMapper.insert(examPaper); } else { examPaper = examPaperMapper.selectById(examPaperEditRequestVO.getId()); - //TODO:寰呭畬鎴� + //TODO: // TextContent frameTextContent = textContentService.getById(examPaper.getFrameTextContentId()); // frameTextContent.setContent(frameTextContentStr); // textContentService.updateById(frameTextContent); @@ -102,7 +219,7 @@ ExamPaper examPaper = examPaperMapper.selectById(id); ExamPaperEditRequestVO vo = new ExamPaperEditRequestVO(); BeanUtils.copyProperties(examPaper, vo); - //TODO:寰呭畬鎴� + //TODO: // TextContent frameTextContent = textContentService.getById(examPaper.getFrameTextContentId()); // List<ExamPaperTitleItemObject> examPaperTitleItemObjects = JsonUtil.toJsonListObject(frameTextContent.getContent(), ExamPaperTitleItemObject.class); // List<Integer> questionIds = examPaperTitleItemObjects.stream() @@ -154,8 +271,10 @@ }).collect(Collectors.toList()); } + + private void examPaperFromVM(ExamPaperEditRequestVO examPaperEditRequestVO, ExamPaper examPaper, List<ExamPaperTitleItemVO> titleItemsVM) { - //TODO:寰呭畬鎴� + //TODO: // Integer gradeLevel = subjectService.levelBySubjectId(examPaperEditRequestVO.getSubjectId()); // Integer questionCount = titleItemsVM.stream() // .mapToInt(t -> t.getQuestionItems().size()).sum(); -- Gitblit v1.8.0