From 8ca64d03d58db959d95f49119be0cb322d6edf2f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Jul 2021 17:25:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/exam/service/ExamPaperService.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/exam/service/ExamPaperService.java b/src/main/java/org/springblade/modules/exam/service/ExamPaperService.java
index 00d25ee..1700284 100644
--- a/src/main/java/org/springblade/modules/exam/service/ExamPaperService.java
+++ b/src/main/java/org/springblade/modules/exam/service/ExamPaperService.java
@@ -16,12 +16,16 @@
  */
 package org.springblade.modules.exam.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.modules.exam.entity.ExamPaper;
+import org.springblade.modules.exam.entity.ExamSubjectChoices;
 import org.springblade.modules.exam.vo.ExamPaperSubjectVO;
 import org.springblade.modules.exam.vo.ExamPaperVO;
+import org.springblade.modules.exam.vo.ExamScoreVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 服务类
@@ -30,8 +34,12 @@
  */
 public interface ExamPaperService extends IService<ExamPaper> {
 
+	IPage<ExamPaperVO> selectExamPaperPage(IPage<ExamScoreVO> page, ExamPaperVO exam);
+
 	ExamPaperSubjectVO queryPagerSubject(ExamPaper paper);
 
+	List<ExamPaperSubjectVO> queryRandomSubject(ExamPaper paper);
+
 	/**
 	 * 计算成绩返回答案接口
 	 * @param paper

--
Gitblit v1.9.3