From 5e49ed67e8980d649201aab001511aec4f03bfeb Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 29 十月 2024 17:19:43 +0800
Subject: [PATCH] 演示
---
src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 612d808..07bf709 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
@@ -46,6 +46,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@@ -74,9 +75,12 @@
examPaper.setScore(new BigDecimal(form.getScore()));
//闅忔満璇曞嵎
if (ExamPaperTypeEnum.Random.getCode().equals(form.getPaperType())) {
- //鏍￠獙棰樼洰鏁伴噺
+ //鏍￠獙鏍囬鏄惁濉啓銆佹牎楠岄鐩暟閲�
List<PaperQuestionSettingDTO> questionSetting = form.getQuestionSetting();
for (PaperQuestionSettingDTO settingDTO : questionSetting) {
+ if(StringUtils.isEmpty(settingDTO.getTitle())){
+ return Result.fail(SystemCode.InnerError.getCode(),"鏍囬涓嶈兘涓虹┖");
+ }
Integer questionType = settingDTO.getQuestionType();
for (PaperSettingItem item : settingDTO.getSettingList()) {
Integer num = item.getNum();
@@ -100,6 +104,12 @@
return Result.ok();
} else if (ExamPaperTypeEnum.Fixed.getCode().equals(form.getPaperType())) {
//鍥哄畾璇曞嵎
+ List<PaperFixQuestionDTO> questionTitleList = form.getQuestionTitleList();
+ for (PaperFixQuestionDTO dto : questionTitleList) {
+ if(StringUtils.isEmpty(dto.getTitle())){
+ return Result.fail(SystemCode.InnerError.getCode(),"鏍囬涓嶈兘涓虹┖");
+ }
+ }
examPaper.setContent(JSON.toJSONString(form.getQuestionTitleList()));
baseMapper.insert(examPaper);
return Result.ok();
@@ -116,6 +126,9 @@
List<PaperSettingItem> settingList = settingDTO.getSettingList();
List<PaperQuestion> questionList = new ArrayList<>();
for (PaperSettingItem item : settingList) {
+ if(StringUtils.isEmpty(settingDTO.getTitle())){
+ return Result.fail(SystemCode.InnerError.getCode(),"鏍囬涓嶈兘涓虹┖");
+ }
Integer num = item.getNum();
Integer difficult = item.getDifficult();
//闇�瑕侀厤缃殑棰樼洰鏁伴噺涓�0鍒欒烦杩�
@@ -328,12 +341,13 @@
public List<ExamPaper> myExamPaper(Integer paperType) {
Integer userId = webContext.getCurrentUser().getId();
List<ExamPaper> list = new LambdaQueryChainWrapper<>(baseMapper)
- .select(ExamPaper::getId, ExamPaper::getName, ExamPaper::getVisibility)
+ .select(ExamPaper::getId, ExamPaper::getName, ExamPaper::getVisibility,ExamPaper::getSuggestTime)
.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)
+ .orderByDesc(ExamPaper::getId)
.list();
list.stream().forEach(item -> {
if (VisibilityEnum.Public.getName().equals(item.getVisibility())) {
@@ -382,6 +396,7 @@
// 鏌ュ嚭鎵�鏈夌殑璇剧洰锛坋xcel涓嬫媺鏁版嵁锛�
List<Subject> subjects = subjectService.list();
List<String> subjectNameList = subjects.stream().map(Subject::getName).collect(Collectors.toList());
+
EasyExcel.write(response.getOutputStream(), ExamPaperImportVO.class)
.sheet("妯℃澘")
.registerWriteHandler(new PaperSelectExcel(subjectNameList))
--
Gitblit v1.8.0