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 | 61 +++++++++++++++++++-----------
1 files changed, 38 insertions(+), 23 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 0d99bb1..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,17 +1,28 @@
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.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.mapper.ExamPaperMapper;
@@ -24,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;
@@ -44,6 +45,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@@ -57,6 +59,8 @@
private final QuestionService questionService;
private final SubjectService subjectService;
private final ExamTemplateMapper examTemplateMapper;
+ private final WebContext webContext;
+
@Override
@Transactional(rollbackFor = Exception.class)
@@ -110,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());
@@ -154,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;
@@ -310,5 +308,22 @@
}).collect(Collectors.toList());
}
-
+ @Override
+ public List<ExamPaper> myExamPaper(Integer paperType) {
+ Integer userId = webContext.getCurrentUser().getId();
+ List<ExamPaper> list = new LambdaQueryChainWrapper<>(baseMapper)
+ .select(ExamPaper::getId, ExamPaper::getName, ExamPaper::getVisibility)
+ .eq(ExamPaper::getCreateUser, userId)
+ .eq(Objects.nonNull(paperType), ExamPaper::getPaperType, paperType)
+ .or()
+ .eq(ExamPaper::getVisibility, VisibilityEnum.Public.getName())
+ .eq(Objects.nonNull(paperType), ExamPaper::getPaperType, paperType)
+ .list();
+ list.stream().forEach(item -> {
+ if (VisibilityEnum.Public.getName().equals(item.getVisibility())) {
+ item.setName(item.getName() + " (鍏紑)");
+ }
+ });
+ return list;
+ }
}
--
Gitblit v1.8.0