From 29b4b0592230e81d2c6933279848d4333787c60d Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Jul 2021 11:27:18 +0800
Subject: [PATCH] 排序问题修复
---
src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
index 01adfae..49ff4e3 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
@@ -26,8 +26,8 @@
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.dispatcher.vo.DispatcherUnitVO;
import org.springblade.modules.exam.entity.ExamPaper;
+import org.springblade.modules.exam.entity.ExamSubjectChoices;
import org.springblade.modules.exam.service.ExamPaperService;
import org.springblade.modules.exam.vo.ExamPaperSubjectVO;
import org.springblade.modules.exam.vo.ExamPaperVO;
@@ -73,6 +73,15 @@
public R<IPage<ExamPaperVO>> list(@ApiIgnore @RequestParam Map<String, Object> exam, Query query) {
IPage<ExamPaper> pages = examPaperService.page(Condition.getPage(query), Condition.getQueryWrapper(exam, ExamPaper.class));
return R.data(ExamPaperWrapper.build().pageVO(pages));
+ }
+
+ /**
+ * 分页
+ */
+ @GetMapping("/pages")
+ public R<IPage<ExamPaperVO>> page(ExamPaperVO exam, Query query) {
+ IPage<ExamPaperVO> pages = examPaperService.selectExamPaperPage(Condition.getPage(query), exam);
+ return R.data(pages);
}
@@ -140,6 +149,18 @@
}
/**
+ * 随机生成考试题目
+ */
+ @GetMapping("/queryRandomSubject")
+ @ApiOperationSupport(order = 8)
+ @ApiOperation(value = "考试题目绑定", notes = "传入exam")
+ public R<List> queryRandomSubject(@ApiParam(value = "主键集合") ExamPaper exam) {
+ List<ExamPaperSubjectVO> subject = examPaperService.queryRandomSubject(exam);
+ return R.data(subject);
+ }
+
+
+ /**
* 返回当前时间
*/
@GetMapping("/getdate")
--
Gitblit v1.9.3