From 269031cf8e6d1e4643e1be2b822bbfebcf87ea4b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 16 Jul 2021 22:39:49 +0800
Subject: [PATCH] 考试成绩计算接口新增

---
 src/main/java/org/springblade/modules/exam/controller/ExamSubjectOptionController.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamSubjectOptionController.java b/src/main/java/org/springblade/modules/exam/controller/ExamSubjectOptionController.java
index 6d71271..de879bf 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamSubjectOptionController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamSubjectOptionController.java
@@ -8,6 +8,7 @@
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.exam.entity.ExamSubjectChoices;
 import org.springblade.modules.exam.entity.ExamSubjectOption;
 import org.springblade.modules.exam.service.ExamSubjectOptionService;
 import org.springblade.modules.exam.vo.ExamSubjectOptionVO;
@@ -35,6 +36,15 @@
 	@GetMapping("/page")
 	public R<IPage<ExamSubjectOptionVO>> page(ExamSubjectOptionVO examSubjectOption, Query query) {
 		IPage<ExamSubjectOptionVO> pages = examSubjectOptionService.selectExamSubjectOptionPage(Condition.getPage(query), examSubjectOption);
+		return R.data(pages);
+	}
+
+	/**
+	 * 分页
+	 */
+	@GetMapping("/list")
+	public R<IPage<ExamSubjectOption>> list(ExamSubjectOption examSubjectOption, Query query) {
+		IPage<ExamSubjectOption> pages = examSubjectOptionService.page(Condition.getPage(query), Condition.getQueryWrapper(examSubjectOption));
 		return R.data(pages);
 	}
 
@@ -86,7 +96,7 @@
 	 */
 	@GetMapping("/detail")
 	@ApiOperation(value = "详情", notes = "传入examSubjectOption")
-	public R<ExamSubjectOptionVO> detail(ExamSubjectOption examSubjectOption) {
+	public R<ExamSubjectOptionVO> details(ExamSubjectOption examSubjectOption) {
 		//查询选择题选项详情
 		ExamSubjectOptionVO detail = examSubjectOptionService.selectExamSubjectOptionInfo(examSubjectOption);
 		//返回

--
Gitblit v1.9.3