From 0c510424ebe81013bc628d5a411457453f84f81b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 24 五月 2024 14:25:37 +0800
Subject: [PATCH] 考试记录计算平均分重写
---
src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java | 20 +++++++++++---------
1 files changed, 11 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 12cad20..1dbbad1 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/QuestionController.java
@@ -18,8 +18,10 @@
import com.mindskip.xzs.domain.enums.QuestionTypeEnum;
import com.mindskip.xzs.domain.question.QuestionItemObject;
import com.mindskip.xzs.domain.question.QuestionObject;
+import com.mindskip.xzs.domain.vo.DeptQuestionVO;
import com.mindskip.xzs.excel.*;
import com.mindskip.xzs.repository.DepartmentMapper;
+import com.mindskip.xzs.repository.DeptQuestionMapper;
import com.mindskip.xzs.repository.SubjectMapper;
import com.mindskip.xzs.service.*;
import com.mindskip.xzs.utility.*;
@@ -55,22 +57,20 @@
private final QuestionService questionService;
private final TextContentService textContentService;
-
private final SubjectMapper subjectMapper;
-
private final DepartmentMapper departmentMapper;
-
private final QuestionSubjectService questionSubjectService;
+ private final DeptQuestionMapper deptQuestionMapper;
private static final String SPLIT = "銆�";
- @Autowired
- public QuestionController(QuestionService questionService, TextContentService textContentService, SubjectMapper subjectMapper, DepartmentMapper departmentMapper, QuestionSubjectService questionSubjectService) {
+ public QuestionController(QuestionService questionService, TextContentService textContentService, SubjectMapper subjectMapper, DepartmentMapper departmentMapper, QuestionSubjectService questionSubjectService, DeptQuestionMapper deptQuestionMapper) {
this.questionService = questionService;
this.textContentService = textContentService;
this.subjectMapper = subjectMapper;
this.departmentMapper = departmentMapper;
this.questionSubjectService = questionSubjectService;
+ this.deptQuestionMapper = deptQuestionMapper;
}
@RequestMapping(value = "/page", method = RequestMethod.POST)
@@ -90,6 +90,9 @@
e.setSubName(subjectMapper.page(subjectPageRequestVM).get(0).getName());
return e;
}).collect(Collectors.toList()));
+ // 鏌ヨ棰樼洰鎵�灞為儴闂�
+ String deptNames = deptQuestionMapper.deptByQuestionId(q.getId()).stream().map(DeptQuestionVO::getDeptName).collect(Collectors.joining("銆�"));
+ vm.setDeptNames(deptNames);
return vm;
});
return RestResponse.ok(page);
@@ -190,13 +193,12 @@
EasyExcel.write(response.getOutputStream(), QuestionImportVO.class)
.sheet("妯℃澘")
.registerWriteHandler(new SelectExcel(subjectNameList))
- .registerWriteHandler(new FixedMergeCellStrategy(2, 4, Arrays.asList(1, 2, 3, 6, 7, 8, 9)))
+ .registerWriteHandler(new FixedMergeCellStrategy(2, 4, Arrays.asList(0, 1, 2, 5, 6, 7, 8)))
.doWrite(data);
}
- @GetMapping("/question/export")
- public void importQuestion(QuestionExportVO query, HttpServletResponse response) throws IOException {
- query.formartTime();
+ @PostMapping("/question/export")
+ public void exportQuestion(@RequestBody QuestionExportVO query, HttpServletResponse response) throws IOException {
// 鏌ヨ瀵煎嚭鏁版嵁
List<QuestionImportVO> exportData = questionService.export(query);
// 鏋勫缓鏁版嵁
--
Gitblit v1.8.0