From a820ec5dc1682ac0a31fcbdba3eb4d2c0fe74b64 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 17:11:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/repository/ExamPaperAnswerMapper.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/repository/ExamPaperAnswerMapper.java b/src/main/java/com/mindskip/xzs/repository/ExamPaperAnswerMapper.java
index 36252a9..531b846 100644
--- a/src/main/java/com/mindskip/xzs/repository/ExamPaperAnswerMapper.java
+++ b/src/main/java/com/mindskip/xzs/repository/ExamPaperAnswerMapper.java
@@ -4,10 +4,7 @@
import com.mindskip.xzs.domain.ExamTemplatesUserCount;
import com.mindskip.xzs.domain.ScoreTemplatesUserCount;
import com.mindskip.xzs.domain.other.KeyValue;
-import com.mindskip.xzs.domain.vo.ExamPaperDataVO;
-import com.mindskip.xzs.domain.vo.ExamPaperStatisticVO;
-import com.mindskip.xzs.domain.vo.ExamTemplatesVO;
-import com.mindskip.xzs.domain.vo.TeamplatesUserExcelVO;
+import com.mindskip.xzs.domain.vo.*;
import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVM;
import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperGradePageRequestVM;
import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperGradeQuery;
@@ -60,13 +57,32 @@
Map<String, Object> histogram(ExamPaperStatisticVO examPaperStatisticVO);
+ Map<String, Object> histogramByTemplate(ExamPaperStatisticVO examPaperStatisticVO);
+
Map<String, Object> pieChart(ExamPaperStatisticVO examPaperStatisticVO);
- List<Map<String, Object>> dataByTemplate(ExamPaperDataVO examPaperDataVO);
+ List<ExamPaperDataExportVO> dataByTemplate(ExamPaperDataVO examPaperDataVO);
- Map<String, Object> totalByTemplate(ExamPaperDataVO examPaperDataVO);
+ ExamPaperDataExportVO totalByTemplate(ExamPaperDataVO examPaperDataVO);
- List<Map<String, Object>> dataByPaper(ExamPaperDataVO examPaperDataVO);
+ List<ExamPaperDataExportVO> dataByPaper(ExamPaperDataVO examPaperDataVO);
- Map<String, Object> totalByPaper(ExamPaperDataVO examPaperDataVO);
+ ExamPaperDataExportVO totalByPaper(ExamPaperDataVO examPaperDataVO);
+
+ Integer getExamTotal(ExamPaperStatisticVO examPaperStatisticVO);
+
+
+ /**
+ * 鏍规嵁绛斿嵎璇曞嵎id鑾峰彇鏈�楂樻垚缁╃瓟鍗�
+ * @param examPaperAnswer 绛斿嵎
+ * @return 鏈�楂樻垚缁╃瓟鍗�
+ */
+ ExamPaperAnswer getTemplateOtherExamAnswer(@Param("examPaperAnswer") ExamPaperAnswer examPaperAnswer, @Param("templateId") Integer templateId);
+
+ /**
+ * 鏍规嵁璇曞嵎id鑾峰彇鏈�楂樻垚缁╃瓟鍗�
+ * @param examPaperAnswer 绛斿嵎
+ * @return 鏈�楂樻垚缁╃瓟鍗�
+ */
+ ExamPaperAnswer getPaperOtherExamAnswer(ExamPaperAnswer examPaperAnswer);
}
--
Gitblit v1.8.0