From 71bc21abbfd1cf7665593fe8efff8965811373ad Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 15 三月 2024 15:15:55 +0800
Subject: [PATCH] 成绩统计增加数据权限、增加时间查询
---
src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 4ac9672..dec03bc 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;
@@ -89,9 +90,8 @@
}
@RequestMapping(value = "/select/{id}", method = RequestMethod.POST)
- public RestResponse<QuestionEditRequestVM> select(@PathVariable Integer id) {
- QuestionEditRequestVM newVM = questionService.getQuestionEditRequestVM(id);
- return RestResponse.ok(newVM);
+ public RestResponse<ExamQuestionVO> select(@PathVariable Integer id) {
+ return RestResponse.ok(questionService.getQuestionEditRequestVM(id));
}
@@ -122,7 +122,7 @@
}
@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()));
@@ -172,12 +172,12 @@
vm.setCorrectArray(str);
vm.setCorrect(null);
}
-
- vm.setScore("2");
+ vm.setScore(QuestionSourceEnum.fromType(vm.getQuestionType()).toString());
vm.setDifficult(4);
questionService.insertFullQuestion(vm, getCurrentUser().getId());
questionEditItemVMS.clear();
}
+ return RestResponse.ok();
}
}
--
Gitblit v1.8.0