From fff73372b4b443d2920f09d2e83702fec07521a6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 22 五月 2024 12:02:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/repository/ExamPaperAnswerMapper.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/repository/ExamPaperAnswerMapper.java b/src/main/java/com/mindskip/xzs/repository/ExamPaperAnswerMapper.java
index 93d769f..06e76c1 100644
--- a/src/main/java/com/mindskip/xzs/repository/ExamPaperAnswerMapper.java
+++ b/src/main/java/com/mindskip/xzs/repository/ExamPaperAnswerMapper.java
@@ -4,6 +4,8 @@
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.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;
@@ -21,7 +23,7 @@
List<ExamPaperAnswer> studentPage(ExamPaperAnswerPageVM requestVM);
- Integer selectAllCount();
+ Integer selectAllCount(List<Integer> deptIds);
List<KeyValue> selectCountByDate(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
@@ -49,9 +51,15 @@
void setMissExam(ExamPaperEditRequestVM model);
+ void setMissExam(ExamTemplatesVO model);
+
+ void setMissExamByTemplate(ExamTemplatesVO model);
+
void insertDefault(ExamPaperEditRequestVM model);
- Map<String, Object> histogram(@Param("examPaperId") String examPaperId, @Param("departmentId") String departmentId);
+ void insertDefaultByTemplate(ExamTemplatesVO model);
- Map<String, Object> pieChart(@Param("examPaperId") String examPaperId, @Param("departmentId") String departmentId);
+ Map<String, Object> histogram(ExamPaperStatisticVO examPaperStatisticVO);
+
+ Map<String, Object> pieChart(ExamPaperStatisticVO examPaperStatisticVO);
}
--
Gitblit v1.8.0