From 161d73fef78ab215077a5f1e87d8b586f29c764f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 23 五月 2024 16:21:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java | 73 ++++++++++++++++++++++++++++++++----
1 files changed, 64 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java
index 5a69f38..8270867 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java
@@ -10,7 +10,8 @@
import com.mindskip.xzs.domain.other.ExamPaperAnswerUpdate;
import com.mindskip.xzs.domain.other.KeyValue;
import com.mindskip.xzs.domain.task.TaskItemAnswerObject;
-import com.mindskip.xzs.domain.vo.ScoreTemplatesCountVO;
+import com.mindskip.xzs.domain.vo.ExamPaperDataVO;
+import com.mindskip.xzs.domain.vo.ExamPaperStatisticVO;
import com.mindskip.xzs.repository.ExamPaperAnswerMapper;
import com.mindskip.xzs.repository.ExamPaperMapper;
import com.mindskip.xzs.repository.QuestionMapper;
@@ -22,6 +23,7 @@
import com.mindskip.xzs.utility.ExamUtil;
import com.mindskip.xzs.utility.JsonUtil;
import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperGradePageRequestVM;
+import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperGradeQuery;
import com.mindskip.xzs.viewmodel.student.exam.ExamPaperSubmitItemVM;
import com.mindskip.xzs.viewmodel.student.exam.ExamPaperSubmitVM;
import com.mindskip.xzs.viewmodel.student.exampaper.ExamPaperAnswerPageVM;
@@ -29,9 +31,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
@Service
@@ -162,8 +162,8 @@
}
@Override
- public Integer selectAllCount() {
- return examPaperAnswerMapper.selectAllCount();
+ public Integer selectAllCount(List<Integer> deptIds) {
+ return examPaperAnswerMapper.selectAllCount(deptIds);
}
@Override
@@ -307,8 +307,63 @@
}
@Override
- public PageInfo<ExamPaperAnswer> getByCreatUser(ScoreTemplatesCountVO scoreTemplatesCountVO) {
- return PageHelper.startPage(scoreTemplatesCountVO.getPageIndex(), scoreTemplatesCountVO.getPageSize(), "id desc").doSelectPageInfo(() ->
- examPaperAnswerMapper.getByCreatUser(scoreTemplatesCountVO));
+ public PageInfo<ExamPaperAnswer> getByCreatUser(ExamPaperGradeQuery query) {
+ query.setFullTime();
+ return PageHelper.startPage(query.getPageIndex(), query.getPageSize(), "id desc").doSelectPageInfo(() ->
+ examPaperAnswerMapper.getByCreatUser(query));
+ }
+
+ @Override
+ public Map<String, Object> statistic(ExamPaperStatisticVO examPaperStatisticVO) {
+ // 鑾峰彇鍘熷鏁版嵁
+ Map<String, Object> histogram = examPaperAnswerMapper.histogram(examPaperStatisticVO);
+ Map<String, Object> pieChart = examPaperAnswerMapper.pieChart(examPaperStatisticVO);
+ // 鍒濆鍖栫粨鏋滃鍣�
+ HashMap<String, Object> map = new HashMap<>();
+ List<Map<String, Object>> score = new ArrayList<>();
+ List<Map<String, Object>> age = new ArrayList<>();
+ List<Map<String, Object>> examPeopleNum = new ArrayList<>();
+ // 澶勭悊鎴愮哗涓庡勾榫勫垎甯�
+ histogram.forEach((k, v) -> {
+ Map<String, Object> hashMap = new HashMap<>();
+ hashMap.put(k, v);
+ if (k.contains("score")) {
+ score.add(hashMap);
+ }
+ if (k.contains("age")) {
+ age.add(hashMap);
+ }
+ });
+ // 澶勭悊鍙傝�冧汉鏁帮紙鍑哄腑涓庣己甯級
+ pieChart.forEach((k, v) -> {
+ Map<String, Object> hashMap = new HashMap<>();
+ hashMap.put(k, v);
+ if ("totalAttended".equals(k)) {
+ examPeopleNum.add(hashMap);
+ }
+ if ("totalAbsent".equals(k)) {
+ examPeopleNum.add(hashMap);
+ }
+ });
+ map.put("score", score);
+ map.put("age", age);
+ map.put("examPeopleNum", examPeopleNum);
+ return map;
+ }
+
+ @Override
+ public Map<String, Object> data(ExamPaperDataVO examPaperDataVO) {
+ Map<String, Object> map = new HashMap<>();
+ // 闅忔満璇曞嵎
+ if (Objects.equals(examPaperDataVO.getType(), 7)) {
+ map.put("data", examPaperAnswerMapper.dataByTemplate(examPaperDataVO));
+ map.put("total", examPaperAnswerMapper.totalByTemplate(examPaperDataVO));
+ }
+ // 鏅�氳瘯鍗�
+ else {
+ map.put("data", examPaperAnswerMapper.dataByPaper(examPaperDataVO));
+ map.put("total", examPaperAnswerMapper.totalByPaper(examPaperDataVO));
+ }
+ return map;
}
}
--
Gitblit v1.8.0