From cdb3f3546b0b3008c62a1a9d5e21dd3c0bf41b44 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 06 Sep 2021 16:55:49 +0800
Subject: [PATCH] 1.培训考试报名接口修改，取消报名接口修改 2.考试成绩查询接口修改，保安个人考试查询接口修改 3.培训查询列表修改
---
src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 09a4532..cda5261 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
@@ -76,7 +76,7 @@
/**
* 分页
*/
- @GetMapping("/page")
+ @GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入exam")
public R<IPage<ExamPaperVO>> list(@ApiIgnore @RequestParam Map<String, Object> exam, Query query) {
@@ -88,8 +88,21 @@
* 分页
*/
@GetMapping("/pages")
- public R<IPage<ExamPaperVO>> page(ExamPaperVO exam, Query query) {
- IPage<ExamPaperVO> pages = examPaperService.selectExamPaperPage(Condition.getPage(query), exam);
+ public R<IPage<ExamPaperVO>> pages(ExamPaperVO exam, Query query) {
+ IPage<ExamPaperVO> pages = examPaperService.selectExamPaperPages(Condition.getPage(query), exam);
+ return R.data(pages);
+ }
+
+
+ /**
+ * 自定义查询
+ * @param query 分页条件
+ * @param examPaperVO 查询参数
+ * @return
+ */
+ @GetMapping("/page")
+ public R<IPage<ExamPaperVO>> page(ExamPaperVO examPaperVO, Query query) {
+ IPage<ExamPaperVO> pages = examPaperService.selectExamPaperPage(Condition.getPage(query), examPaperVO);
return R.data(pages);
}
@@ -196,7 +209,6 @@
Date date = new Date();
String strDateFormat = "yyyy-MM-dd HH:mm:ss";
SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat);
- System.out.println(sdf.format(date));
return R.data(sdf.format(date));
}
--
Gitblit v1.9.3