From 47cd9ecc0eff38ffe6b3b794b2bf197e958f4403 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 14 五月 2025 15:50:57 +0800
Subject: [PATCH] bug：学员有状态不能修改问题
---
src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java
index dc7628d..b355128 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java
@@ -7,7 +7,6 @@
import com.github.pagehelper.PageInfo;
import com.mindskip.xzs.base.BaseApiController;
import com.mindskip.xzs.base.RestResponse;
-import com.mindskip.xzs.domain.Department;
import com.mindskip.xzs.domain.ExamPaperAnswer;
import com.mindskip.xzs.domain.ExamPaperSubject;
import com.mindskip.xzs.domain.Subject;
@@ -20,13 +19,11 @@
import com.mindskip.xzs.utility.DateTimeUtil;
import com.mindskip.xzs.utility.ExamUtil;
import com.mindskip.xzs.utility.PageInfoHelper;
-import com.mindskip.xzs.utility.excel.ExcelUtils;
import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperAnswerPageRequestVM;
import com.mindskip.xzs.viewmodel.student.exampaper.ExamPaperAnswerPageResponseVM;
import lombok.RequiredArgsConstructor;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -39,6 +36,7 @@
import java.math.RoundingMode;
import java.util.List;
import java.util.Map;
+import java.util.TreeMap;
import java.util.stream.Collectors;
@RequiredArgsConstructor
@@ -141,7 +139,6 @@
@RequestMapping(value = "/export", method = RequestMethod.GET)
public void export(Integer id, Integer type, HttpServletResponse response) {
-
try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).build()) {
// 閮ㄩ棬鑰冭瘯缁熻sheet
List<ExamPaperDataExportVO> list = examPaperAnswerService.dataExport(new ExamPaperDataVO().setId(id).setType(type));
@@ -149,18 +146,15 @@
excelWriter.write(list, writeSheet);
// 鑰冭瘯璇︽儏sheet锛屼竴涓崟浣嶄竴涓猻heet
- List<PaperExcelVO> paperDetailList = examPaperService.getPaperExcelById(id);
- List<Integer> deptIds = paperDetailList.stream().map(PaperExcelVO::getDeptId).collect(Collectors.toList());
- Map<Integer, List<Department>> deptMap = departmentService.gets(deptIds).stream().collect(Collectors.groupingBy(Department::getId));
+ List<PaperExcelVO> paperDetailList = examPaperService.getRandomPaperExcelById(id);
Map<Integer, List<PaperExcelVO>> deptDataMap = paperDetailList.stream().collect(Collectors.groupingBy(PaperExcelVO::getDeptId));
- deptDataMap.forEach((deptId, paperList) -> {
- List<Department> departments = deptMap.get(deptId);
- String name = "";
- if (CollectionUtils.isNotEmpty(departments)) {
- name = departments.get(0).getName();
+ Map<Integer, List<PaperExcelVO>> sortedDeptDataMap = new TreeMap<>(deptDataMap);
+ sortedDeptDataMap.forEach((deptId, paperList) -> {
+ if (CollectionUtils.isNotEmpty(paperList) && ObjectUtils.isNotEmpty(paperList.get(0))) {
+ String name = paperList.get(0).getDepartmentName();
+ WriteSheet writeSheetNext = EasyExcel.writerSheet(name).head(PaperExcelVO.class).build();
+ excelWriter.write(paperList, writeSheetNext);
}
- WriteSheet writeSheetNext = EasyExcel.writerSheet(name).head(PaperExcelVO.class).build();
- excelWriter.write(paperList, writeSheetNext);
});
} catch (IOException e) {
e.printStackTrace();
--
Gitblit v1.8.0