From e1a6bbd46dc46d42e5e58382c132c704a3d8be3b Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期三, 14 六月 2023 15:52:25 +0800
Subject: [PATCH] 导入题目修改
---
src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java b/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java
index a7e40d9..031696d 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java
@@ -4,6 +4,7 @@
import com.mindskip.xzs.base.RestResponse;
import com.mindskip.xzs.base.SystemCode;
import com.mindskip.xzs.domain.Question;
+import com.mindskip.xzs.domain.Subject;
import com.mindskip.xzs.domain.TextContent;
import com.mindskip.xzs.domain.enums.QuestionTypeEnum;
import com.mindskip.xzs.domain.question.QuestionObject;
@@ -125,7 +126,7 @@
List<QuestionEditVO> questionEditVOS = ExcelUtils.readMultipartFile(file, QuestionEditVO.class)
.stream().map(e -> {
e.setQuestionType(QuestionTypeEnum.get(e.getType()));
- e.setSubjectId(subjectMapper.getName(e.getSubjectName()).getId());
+// e.setSubjectId(subjectMapper.getName(e.getSbNames()).getId());
e.setGradeLevel(departmentMapper.getName(e.getDepartment()).getId());
return e;
}).collect(Collectors.toList());
@@ -145,17 +146,28 @@
questionEditItemVM.setPrefix("B");
questionEditItemVM.setContent(vm.getB());
questionEditItemVMS.add(questionEditItemVM);
- questionEditItemVM = new QuestionEditItemVM();
- questionEditItemVM.setPrefix("C");
- questionEditItemVM.setContent(vm.getC());
- questionEditItemVMS.add(questionEditItemVM);
- questionEditItemVM = new QuestionEditItemVM();
- questionEditItemVM.setPrefix("D");
- questionEditItemVM.setContent(vm.getD());
- questionEditItemVMS.add(questionEditItemVM);
+ if(!"".equals(vm.getC()) && vm.getC()!=null){
+ questionEditItemVM = new QuestionEditItemVM();
+ questionEditItemVM.setPrefix("C");
+ questionEditItemVM.setContent(vm.getC());
+ questionEditItemVMS.add(questionEditItemVM);
+ }
+ if(!"".equals(vm.getD()) && vm.getD()!=null){
+ questionEditItemVM = new QuestionEditItemVM();
+ questionEditItemVM.setPrefix("D");
+ questionEditItemVM.setContent(vm.getD());
+ questionEditItemVMS.add(questionEditItemVM);
+ }
vm.setItems(questionEditItemVMS);
List<String> str = Arrays.asList(vm.getCorrect().split(","));
+ List<Subject> subjectList = subjectMapper.getNames(vm.getSbNames().split(","));
+
+ Integer[] arr =subjectList.stream().filter(e->
+ e.getLevelName().equals(subjectList.get(0).getLevelName()))
+ .map(Subject::getId).toArray(Integer[]::new);
+
+ vm.setSubjectIds(arr);
//澶氶��
if (str.size() > 1) {
vm.setCorrectArray(str);
--
Gitblit v1.8.0