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/repository/ExamPaperAnswerMapper.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/repository/ExamPaperAnswerMapper.java b/src/main/java/com/mindskip/xzs/repository/ExamPaperAnswerMapper.java
index 5ad4dcf..36252a9 100644
--- a/src/main/java/com/mindskip/xzs/repository/ExamPaperAnswerMapper.java
+++ b/src/main/java/com/mindskip/xzs/repository/ExamPaperAnswerMapper.java
@@ -4,7 +4,9 @@
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.viewmodel.admin.exam.ExamPaperEditRequestVM;
import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperGradePageRequestVM;
@@ -22,7 +24,7 @@
List<ExamPaperAnswer> studentPage(ExamPaperAnswerPageVM requestVM);
- Integer selectAllCount();
+ Integer selectAllCount(List<Integer> deptIds);
List<KeyValue> selectCountByDate(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
@@ -50,9 +52,21 @@
void setMissExam(ExamPaperEditRequestVM model);
+ void setMissExam(ExamTemplatesVO model);
+
+ void setMissExamByTemplate(ExamTemplatesVO model);
+
void insertDefault(ExamPaperEditRequestVM model);
Map<String, Object> histogram(ExamPaperStatisticVO examPaperStatisticVO);
Map<String, Object> pieChart(ExamPaperStatisticVO examPaperStatisticVO);
+
+ List<Map<String, Object>> dataByTemplate(ExamPaperDataVO examPaperDataVO);
+
+ Map<String, Object> totalByTemplate(ExamPaperDataVO examPaperDataVO);
+
+ List<Map<String, Object>> dataByPaper(ExamPaperDataVO examPaperDataVO);
+
+ Map<String, Object> totalByPaper(ExamPaperDataVO examPaperDataVO);
}
--
Gitblit v1.8.0