From c50e176c4a6b9331d2d1c0520bafb18f54f0dee6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 08 三月 2024 17:35:10 +0800
Subject: [PATCH] 部门增加管理员
---
src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 031696d..b9c60e0 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java
@@ -6,6 +6,7 @@
import com.mindskip.xzs.domain.Question;
import com.mindskip.xzs.domain.Subject;
import com.mindskip.xzs.domain.TextContent;
+import com.mindskip.xzs.domain.enums.QuestionSourceEnum;
import com.mindskip.xzs.domain.enums.QuestionTypeEnum;
import com.mindskip.xzs.domain.question.QuestionObject;
import com.mindskip.xzs.repository.DepartmentMapper;
@@ -51,7 +52,7 @@
}
@RequestMapping(value = "/page", method = RequestMethod.POST)
- public RestResponse<PageInfo<QuestionResponseVM>> pageList(@RequestBody QuestionPageRequestVM model) {
+ public RestResponse<PageInfo<QuestionResponseVM>> pageList(@RequestBody @Valid QuestionPageRequestVM model) {
PageInfo<Question> pageInfo = questionService.page(model);
PageInfo<QuestionResponseVM> page = PageInfoHelper.copyMap(pageInfo, q -> {
QuestionResponseVM vm = modelMapper.map(q, QuestionResponseVM.class);
@@ -122,12 +123,12 @@
}
@PostMapping("/import")
- public void importUser(@RequestPart("file") MultipartFile file) throws Exception {
+ public RestResponse importUser(@RequestPart("file") MultipartFile file) throws Exception {
List<QuestionEditVO> questionEditVOS = ExcelUtils.readMultipartFile(file, QuestionEditVO.class)
.stream().map(e -> {
e.setQuestionType(QuestionTypeEnum.get(e.getType()));
// e.setSubjectId(subjectMapper.getName(e.getSbNames()).getId());
- e.setGradeLevel(departmentMapper.getName(e.getDepartment()).getId());
+// e.setGradeLevel(departmentMapper.getName(e.getDepartment()).getId());
return e;
}).collect(Collectors.toList());
@@ -163,8 +164,7 @@
List<Subject> subjectList = subjectMapper.getNames(vm.getSbNames().split(","));
- Integer[] arr =subjectList.stream().filter(e->
- e.getLevelName().equals(subjectList.get(0).getLevelName()))
+ Integer[] arr =subjectList.stream()
.map(Subject::getId).toArray(Integer[]::new);
vm.setSubjectIds(arr);
@@ -173,9 +173,12 @@
vm.setCorrectArray(str);
vm.setCorrect(null);
}
+ vm.setScore(QuestionSourceEnum.fromType(vm.getQuestionType()).toString());
+ vm.setDifficult(4);
questionService.insertFullQuestion(vm, getCurrentUser().getId());
questionEditItemVMS.clear();
}
+ return RestResponse.ok();
}
}
--
Gitblit v1.8.0