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/service/ExamPaperAnswerService.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/service/ExamPaperAnswerService.java b/src/main/java/com/mindskip/xzs/service/ExamPaperAnswerService.java
index 5f24cad..db11300 100644
--- a/src/main/java/com/mindskip/xzs/service/ExamPaperAnswerService.java
+++ b/src/main/java/com/mindskip/xzs/service/ExamPaperAnswerService.java
@@ -2,6 +2,8 @@
 
 import com.github.pagehelper.PageInfo;
 import com.mindskip.xzs.domain.*;
+import com.mindskip.xzs.domain.vo.ExamPaperDataVO;
+import com.mindskip.xzs.domain.vo.ExamPaperStatisticVO;
 import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperGradePageRequestVM;
 import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperGradeQuery;
 import com.mindskip.xzs.viewmodel.student.exam.ExamPaperSubmitVM;
@@ -46,7 +48,7 @@
     ExamPaperSubmitVM examPaperAnswerToVM(Integer id);
 
 
-    Integer selectAllCount();
+    Integer selectAllCount(List<Integer> deptIds);
 
     List<Integer> selectMothCount();
 
@@ -64,5 +66,7 @@
 
     PageInfo<ExamPaperAnswer> getByCreatUser(ExamPaperGradeQuery query);
 
-    Map<String, Object> statistic(String examPaperId, String departmentId);
+    Map<String, Object> statistic(ExamPaperStatisticVO examPaperStatisticVO);
+
+    Map<String, Object> data(ExamPaperDataVO examPaperDataVO);
 }

--
Gitblit v1.8.0