From 9654776025968dcc4c9e41ee7b6578d72bbf9b43 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 16 五月 2024 09:49:26 +0800
Subject: [PATCH] 统一相应类重构
---
src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 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 25c7afe..82a7cd6 100644
--- a/src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java
+++ b/src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java
@@ -313,15 +313,39 @@
@Override
public Map<String, Object> statistic(String examPaperId, String departmentId) {
- HashMap<String, Object> map = new HashMap<>();
+ // 鑾峰彇鍘熷鏁版嵁
Map<String, Object> histogram = examPaperAnswerMapper.histogram(examPaperId, departmentId);
Map<String, Object> pieChart = examPaperAnswerMapper.pieChart(examPaperId, departmentId);
- ArrayList<Double> histograms = new ArrayList<>();
- ArrayList<Double> pieCharts = new ArrayList<>();
- histogram.forEach((k, v) -> histograms.add(Double.valueOf(v.toString())));
- pieChart.forEach((k, v) -> pieCharts.add(Double.valueOf(v.toString())));
- map.put("histogram", histograms);
- map.put("pieChart", pieCharts);
+ // 鍒濆鍖栫粨鏋滃鍣�
+ 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;
}
}
--
Gitblit v1.8.0