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 | 142 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 125 insertions(+), 17 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 5db2e13..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,20 +1,45 @@
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.ExamPaperAnswer;
+import com.mindskip.xzs.domain.ExamPaperSubject;
import com.mindskip.xzs.domain.Subject;
-import com.mindskip.xzs.domain.User;
+import com.mindskip.xzs.domain.exam.ExamPaperAnswerObject;
+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.viewmodel.student.exampaper.ExamPaperAnswerPageResponseVM;
import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperAnswerPageRequestVM;
-import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+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.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.TreeMap;
+import java.util.stream.Collectors;
+
+@RequiredArgsConstructor
@RestController("AdminExamPaperAnswerController")
@RequestMapping(value = "/api/admin/examPaperAnswer")
public class ExamPaperAnswerController extends BaseApiController {
@@ -22,35 +47,118 @@
private final ExamPaperAnswerService examPaperAnswerService;
private final SubjectService subjectService;
private final UserService userService;
-
- @Autowired
- public ExamPaperAnswerController(ExamPaperAnswerService examPaperAnswerService, SubjectService subjectService, UserService userService) {
- this.examPaperAnswerService = examPaperAnswerService;
- this.subjectService = subjectService;
- this.userService = userService;
- }
+ private final ExamPaperSubjectService examPaperSubjectService;
+ private final ExamPaperService examPaperService;
+ private final DepartmentService departmentService;
@RequestMapping(value = "/page", method = RequestMethod.POST)
public RestResponse<PageInfo<ExamPaperAnswerPageResponseVM>> pageJudgeList(@RequestBody ExamPaperAnswerPageRequestVM model) {
PageInfo<ExamPaperAnswer> pageInfo = examPaperAnswerService.adminPage(model);
PageInfo<ExamPaperAnswerPageResponseVM> page = PageInfoHelper.copyMap(pageInfo, e -> {
- User user = userService.selectById(e.getCreateUser());
-// if(user.getUserName().)
+
ExamPaperAnswerPageResponseVM vm = modelMapper.map(e, ExamPaperAnswerPageResponseVM.class);
- Subject subject = subjectService.selectById(vm.getSubjectId());
+// User user = userService.selectByIdName(e.getCreateUser(), model.getUserName());
+// if (user == null) {
+// return null;
+// }
+// Subject subject = subjectService.selectById(vm.getSubjectId());
+ ExamPaperAnswer examPaperAnswer = examPaperAnswerService.getById(vm.getId());
+ Integer[] ids = examPaperSubjectService.getByExamPaperId(examPaperAnswer.getExamPaperId())
+ .stream().map(ExamPaperSubject::getSubjectId).toArray(Integer[]::new);
+ String name = "";
+ if (ids.length > 0) {
+ name = subjectService.selectByIds(ids)
+ .stream().map(Subject::getName).collect(Collectors.joining(","));
+ }
vm.setDoTime(ExamUtil.secondToVM(e.getDoTime()));
vm.setSystemScore(ExamUtil.scoreToVM(e.getSystemScore()));
vm.setUserScore(ExamUtil.scoreToVM(e.getUserScore()));
vm.setPaperScore(ExamUtil.scoreToVM(e.getPaperScore()));
- vm.setSubjectName(subject.getName());
+ vm.setSubjectName(name);
vm.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
- vm.setUserName(user.getUserName());
return vm;
});
+ if (page.getList().size() > 0) {
+ 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);
}
+ @RequestMapping(value = "/paperStatistics", method = RequestMethod.POST)
+ public RestResponse<ExamPaperAnswerObject> paperStatistics(@RequestBody @Valid String paperName) {
+ ExamPaperAnswerObject object = new ExamPaperAnswerObject();
+ String str = JSONObject.parseObject(paperName).get("paperName").toString();
+ List<ExamPaperAnswer> examPaperAnswers = examPaperAnswerService.selectByPaperName(str)
+ .stream().map(e -> {
+ e.setUserScore(e.getUserScore() / 10);
+ return e;
+ }).collect(Collectors.toList());
+ if (examPaperAnswers.size() == 0) {
+ object.setAdvanced(0);
+ object.setAvg(0.0);
+ object.setIntermediate(0);
+ object.setMax(0);
+ object.setMin(0);
+ object.setLowGrade(0);
+ } else {
+ Integer lowGrade = examPaperAnswers.stream().filter(e -> e.getUserScore() < 60 && 0 <= e.getUserScore()).collect(Collectors.toList()).size();
+ Integer intermediate = examPaperAnswers.stream().filter(e -> e.getUserScore() < 80 && 60 <= e.getUserScore()).collect(Collectors.toList()).size();
+ Integer advanced = examPaperAnswers.stream().filter(e -> e.getUserScore() <= 100 && 80 <= e.getUserScore()).collect(Collectors.toList()).size();
+ Integer max = examPaperAnswers.stream().map(ExamPaperAnswer::getUserScore).max(Integer::compareTo).get();
+ Integer min = examPaperAnswers.stream().map(ExamPaperAnswer::getUserScore).min(Integer::compareTo).get();
+ Double avg = examPaperAnswers.stream().mapToDouble(ExamPaperAnswer::getUserScore).average().getAsDouble();
+ BigDecimal two = new BigDecimal(avg);
+ Double three = two.setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
+ object.setAdvanced(advanced);
+ object.setAvg(three);
+ object.setIntermediate(intermediate);
+ object.setMax(max);
+ object.setMin(min);
+ object.setLowGrade(lowGrade);
+ }
+ return RestResponse.ok(object);
+ }
+
+ @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);
+ 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