Merge remote-tracking branch 'origin/master'

xiangpei

2024-05-17 f4f84ef25ce94e59dfe57961fcbb3c81f738ebb8

 src/main/java/com/mindskip/xzs/service/impl/ExamPaperAnswerServiceImpl.java

@@ -10,6 +10,7 @@
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.ExamPaperStatisticVO;
import com.mindskip.xzs.repository.ExamPaperAnswerMapper;
import com.mindskip.xzs.repository.ExamPaperMapper;
import com.mindskip.xzs.repository.QuestionMapper;
@@ -21,6 +22,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;
@@ -28,9 +30,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
@@ -161,8 +161,8 @@
    }

    @Override
    public Integer selectAllCount() {
        return examPaperAnswerMapper.selectAllCount();
    public Integer selectAllCount(List<Integer> deptIds) {
        return examPaperAnswerMapper.selectAllCount(deptIds);
    }

    @Override
@@ -296,7 +296,57 @@

    @Override
    public PageInfo<ExamPaperAnswer> adminPageByGrade(ExamPaperGradePageRequestVM grade) {
        return PageHelper.startPage(grade.getPageIndex(), grade.getPageSize(), "user_score desc").doSelectPageInfo(() ->
        return PageHelper.startPage(grade.getPageIndex(), grade.getPageSize(), "id desc").doSelectPageInfo(() ->
                examPaperAnswerMapper.adminPageByGrade(grade));
    }

    @Override
    public List<ExamPaperAnswer> getByScorePaperIdAndUserId(List<ScoreTemplatesUserCount> scoreTemplatesUserCounts) {
        return examPaperAnswerMapper.getByScorePaperIdAndUserId(scoreTemplatesUserCounts);
    }

    @Override
    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;
    }
}