From 8883d90ba7d60a61590b715d1a3be9e3ae2adb2d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 29 十月 2024 13:32:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/service/ExamPaperScoreService.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/service/ExamPaperScoreService.java b/src/main/java/com/ycl/jxkg/service/ExamPaperScoreService.java
index 8449520..9ac0ec6 100644
--- a/src/main/java/com/ycl/jxkg/service/ExamPaperScoreService.java
+++ b/src/main/java/com/ycl/jxkg/service/ExamPaperScoreService.java
@@ -6,9 +6,11 @@
import com.ycl.jxkg.domain.entity.ExamPaperScore;
import com.ycl.jxkg.domain.entity.User;
import com.ycl.jxkg.domain.vo.admin.paper.ExamPaperAnswerPageRequestVO;
+import com.ycl.jxkg.domain.vo.admin.paper.UserAnswerPageRequestVO;
import com.ycl.jxkg.domain.vo.student.exam.ExamPaperSubmitVO;
import com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageResponseVO;
import com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageVO;
+import com.ycl.jxkg.domain.vo.student.exampaper.UserAnswerPageResponseVO;
import java.util.List;
@@ -20,7 +22,7 @@
* @param requestVM 杩囨护鏉′欢
* @return PageInfo<ExamPaperAnswer>
*/
- PageInfo<ExamPaperScore> studentPage(ExamPaperAnswerPageVO requestVM);
+ PageInfo<ExamPaperAnswerPageResponseVO> studentPage(ExamPaperAnswerPageVO requestVM);
/**
* 璁＄畻璇曞嵎鎻愪氦缁撴灉(涓嶅叆搴�)
@@ -50,6 +52,7 @@
Integer selectAllCount();
+ Integer selectAllQuestionCount();
List<Integer> selectMothCount();
PageInfo<ExamPaperAnswerPageResponseVO> adminPage(ExamPaperAnswerPageRequestVO requestVM);
@@ -67,4 +70,11 @@
* @return 鏁版嵁
*/
PageInfo<ExamPaperAnswerPageResponseVO> pageExamPaper(ExamPaperAnswerPageRequestVO model);
+
+ /**
+ * 鐢ㄦ埛鍒楄〃
+ * @param model 鏌ヨ鏉′欢
+ * @return 鏁版嵁
+ */
+ PageInfo<UserAnswerPageResponseVO> pageUser(UserAnswerPageRequestVO model);
}
--
Gitblit v1.8.0