From a6a3bb04cdaa334a2868d09b20518ed98575bccb Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 02 七月 2024 18:08:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/service/ExamPaperAnswerService.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/service/ExamPaperAnswerService.java b/src/main/java/com/mindskip/xzs/service/ExamPaperAnswerService.java
index 3db0a56..c62006d 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.ExamPaperDataExportVO;
+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;
@@ -47,7 +49,7 @@
ExamPaperSubmitVM examPaperAnswerToVM(Integer id);
- Integer selectAllCount();
+ Integer selectAllCount(List<Integer> deptIds);
List<Integer> selectMothCount();
@@ -66,4 +68,8 @@
PageInfo<ExamPaperAnswer> getByCreatUser(ExamPaperGradeQuery query);
Map<String, Object> statistic(ExamPaperStatisticVO examPaperStatisticVO);
+
+ Map<String, Object> data(ExamPaperDataVO examPaperDataVO);
+
+ List<ExamPaperDataExportVO> dataExport(ExamPaperDataVO examPaperDataVO);
}
--
Gitblit v1.8.0