From a902b3ea7d5ec9b73c9ab54d09a6ab23fd5acb35 Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期五, 16 六月 2023 15:27:46 +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..55f12a2 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java
@@ -51,7 +51,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 +122,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 +163,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);
@@ -174,8 +173,12 @@
                 vm.setCorrect(null);
             }
 
+            vm.setScore("2");
+            vm.setDifficult(4);
+
             questionService.insertFullQuestion(vm, getCurrentUser().getId());
             questionEditItemVMS.clear();
         }
+        return RestResponse.ok();
     }
 }

--
Gitblit v1.8.0