From decf7856a39ff88488285cac45d3298f2844d614 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 14 五月 2024 18:12:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 eedd73f..25c7afe 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,6 @@
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.repository.ExamPaperAnswerMapper;
import com.mindskip.xzs.repository.ExamPaperMapper;
import com.mindskip.xzs.repository.QuestionMapper;
@@ -30,9 +29,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
@@ -313,4 +310,18 @@
return PageHelper.startPage(query.getPageIndex(), query.getPageSize(), "id desc").doSelectPageInfo(() ->
examPaperAnswerMapper.getByCreatUser(query));
}
+
+ @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);
+ return map;
+ }
}
--
Gitblit v1.8.0