From a820ec5dc1682ac0a31fcbdba3eb4d2c0fe74b64 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 16 七月 2024 17:11:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java | 84 ++++++++++++++++++++++++++++++++--------- 1 files changed, 65 insertions(+), 19 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 2a86dae..cd5e1cf 100644 --- a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java +++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java @@ -1,31 +1,47 @@ 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; 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; import com.mindskip.xzs.domain.exam.ExamPaperAnswerObject; -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.ExamPaperDataExportVO; +import com.mindskip.xzs.domain.vo.ExamPaperDataVO; +import com.mindskip.xzs.domain.vo.ExamPaperStatisticVO; +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.*; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; +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.stream.Collectors; +@RequiredArgsConstructor @RestController("AdminExamPaperAnswerController") @RequestMapping(value = "/api/admin/examPaperAnswer") public class ExamPaperAnswerController extends BaseApiController { @@ -34,14 +50,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) @@ -70,12 +80,13 @@ vm.setSubjectName(name); vm.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime())); -// vm.setUserName(user.getRealName()); return vm; }); -// page.setList(page.getList().stream().filter(e -> e != null).collect(Collectors.toList())); if (page.getList().size() > 0) { - Double avg = page.getList().stream().mapToInt(ExamPaperAnswerPageResponseVM -> Integer.parseInt(ExamPaperAnswerPageResponseVM.getUserScore())).average().getAsDouble(); + BigDecimal sum = page.getList().stream() + .map(ExamPaperAnswerPageResponseVM -> new BigDecimal(ExamPaperAnswerPageResponseVM.getUserScore())) + .reduce(BigDecimal.ZERO, BigDecimal::add); // 璁$畻鎬诲拰 + Double avg = sum.divide(BigDecimal.valueOf(page.getList().size()), 2, RoundingMode.HALF_UP).doubleValue(); page.getList().get(0).setAvgSource(avg); } return RestResponse.ok(page); @@ -116,8 +127,43 @@ return RestResponse.ok(object); } - @RequestMapping(value = "/statistic", method = RequestMethod.GET) - public RestResponse<Map<String, Object>> statistic(String examPaperId, String departmentId) { - return RestResponse.ok(examPaperAnswerService.statistic(examPaperId, departmentId)); + @RequestMapping(value = "/statistic", method = RequestMethod.POST) + public RestResponse<Map<String, Object>> statistic(@RequestBody ExamPaperStatisticVO examPaperStatisticVO) { + examPaperStatisticVO.setDepartmentId(ObjectUtils.isNotEmpty(examPaperStatisticVO.getDepartmentId()) ? examPaperStatisticVO.getDepartmentId() : getAdminDeptIds()); + return RestResponse.ok(examPaperAnswerService.statistic(examPaperStatisticVO)); } + + @RequestMapping(value = "/data", method = RequestMethod.POST) + public RestResponse<Map<String, Object>> data(@RequestBody ExamPaperDataVO examPaperDataVO) { + return RestResponse.ok(examPaperAnswerService.data(examPaperDataVO)); + } + + @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)); + WriteSheet writeSheet = EasyExcel.writerSheet("閮ㄩ棬鏁版嵁缁熻").head(ExamPaperDataExportVO.class).build(); + excelWriter.write(list, writeSheet); + + // 鑰冭瘯璇︽儏sheet锛屼竴涓崟浣嶄竴涓猻heet + List<PaperExcelVO> paperDetailList = examPaperService.getRandomPaperExcelById(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)); + 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(); + } + WriteSheet writeSheetNext = EasyExcel.writerSheet(name).head(PaperExcelVO.class).build(); + excelWriter.write(paperList, writeSheetNext); + }); + } catch (IOException e) { + e.printStackTrace(); + } + } + } -- Gitblit v1.8.0