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 | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 insertions(+), 16 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 5ed2c9f..b355128 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java
@@ -1,5 +1,8 @@
package com.mindskip.xzs.controller.admin;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo;
import com.mindskip.xzs.base.BaseApiController;
@@ -11,18 +14,16 @@
import com.mindskip.xzs.domain.vo.ExamPaperDataExportVO;
import com.mindskip.xzs.domain.vo.ExamPaperDataVO;
import com.mindskip.xzs.domain.vo.ExamPaperStatisticVO;
-import com.mindskip.xzs.service.ExamPaperAnswerService;
-import com.mindskip.xzs.service.ExamPaperSubjectService;
-import com.mindskip.xzs.service.SubjectService;
-import com.mindskip.xzs.service.UserService;
+import com.mindskip.xzs.domain.vo.PaperExcelVO;
+import com.mindskip.xzs.service.*;
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;
@@ -30,12 +31,15 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.List;
import java.util.Map;
+import java.util.TreeMap;
import java.util.stream.Collectors;
+@RequiredArgsConstructor
@RestController("AdminExamPaperAnswerController")
@RequestMapping(value = "/api/admin/examPaperAnswer")
public class ExamPaperAnswerController extends BaseApiController {
@@ -44,14 +48,8 @@
private final SubjectService subjectService;
private final UserService userService;
private final ExamPaperSubjectService examPaperSubjectService;
-
- @Autowired
- public ExamPaperAnswerController(ExamPaperAnswerService examPaperAnswerService, SubjectService subjectService, UserService userService, ExamPaperSubjectService examPaperSubjectService) {
- this.examPaperAnswerService = examPaperAnswerService;
- this.subjectService = subjectService;
- this.userService = userService;
- this.examPaperSubjectService = examPaperSubjectService;
- }
+ private final ExamPaperService examPaperService;
+ private final DepartmentService departmentService;
@RequestMapping(value = "/page", method = RequestMethod.POST)
@@ -140,8 +138,27 @@
@RequestMapping(value = "/export", method = RequestMethod.GET)
public void export(Integer id, Integer type, HttpServletResponse response) {
- List<ExamPaperDataExportVO> list = examPaperAnswerService.dataExport(new ExamPaperDataVO().setId(id).setType(type));
- ExcelUtils.export(response, "鍒嗘暟缁熻", list, ExamPaperDataExportVO.class);
+
+ try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).build()) {
+ // 閮ㄩ棬鑰冭瘯缁熻sheet
+ List<ExamPaperDataExportVO> list = examPaperAnswerService.dataExport(new ExamPaperDataVO().setId(id).setType(type));
+ WriteSheet writeSheet = EasyExcel.writerSheet("閮ㄩ棬鏁版嵁缁熻").head(ExamPaperDataExportVO.class).build();
+ excelWriter.write(list, writeSheet);
+
+ // 鑰冭瘯璇︽儏sheet锛屼竴涓崟浣嶄竴涓猻heet
+ List<PaperExcelVO> paperDetailList = examPaperService.getRandomPaperExcelById(id);
+ Map<Integer, List<PaperExcelVO>> deptDataMap = paperDetailList.stream().collect(Collectors.groupingBy(PaperExcelVO::getDeptId));
+ 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);
+ }
+ });
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
}
}
--
Gitblit v1.8.0