From d8524dc5ef974bcfacba99128d5e79a268ccdf3f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 28 十一月 2023 23:39:29 +0800
Subject: [PATCH] 随机案件时间段回显
---
src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java | 72 ++++++++++++++++++++++++++++++++---
1 files changed, 65 insertions(+), 7 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..d33026b 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperAnswerController.java
@@ -1,10 +1,15 @@
package com.mindskip.xzs.controller.admin;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.google.gson.JsonObject;
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.service.*;
import com.mindskip.xzs.utility.DateTimeUtil;
import com.mindskip.xzs.utility.ExamUtil;
@@ -15,6 +20,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.stream.Collectors;
+
@RestController("AdminExamPaperAnswerController")
@RequestMapping(value = "/api/admin/examPaperAnswer")
public class ExamPaperAnswerController extends BaseApiController {
@@ -22,12 +31,14 @@
private final ExamPaperAnswerService examPaperAnswerService;
private final SubjectService subjectService;
private final UserService userService;
+ private final ExamPaperSubjectService examPaperSubjectService;
@Autowired
- public ExamPaperAnswerController(ExamPaperAnswerService examPaperAnswerService, SubjectService subjectService, UserService userService) {
+ public ExamPaperAnswerController(ExamPaperAnswerService examPaperAnswerService, SubjectService subjectService, UserService userService, ExamPaperSubjectService examPaperSubjectService) {
this.examPaperAnswerService = examPaperAnswerService;
this.subjectService = subjectService;
this.userService = userService;
+ this.examPaperSubjectService = examPaperSubjectService;
}
@@ -35,22 +46,69 @@
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());
+ vm.setUserName(user.getRealName());
return vm;
});
+ page.setList(page.getList().stream().filter(e -> e != null).collect(Collectors.toList()));
+ if (page.getSize() > 0) {
+ Double avg = page.getList().stream().mapToInt(ExamPaperAnswerPageResponseVM -> Integer.parseInt(ExamPaperAnswerPageResponseVM.getUserScore())).average().getAsDouble();
+ 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();
+ object.setAdvanced(advanced);
+ object.setAvg(avg);
+ object.setIntermediate(intermediate);
+ object.setMax(max);
+ object.setMin(min);
+ object.setLowGrade(lowGrade);
+ }
+ return RestResponse.ok(object);
+ }
}
--
Gitblit v1.8.0