From 30df94c05573a426d030510d4dd58ae1d93bfb7a Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 14:03:37 +0800
Subject: [PATCH] 1.资格审查排序
---
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
index f8875d8..a42313f 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -50,6 +50,18 @@
private final ExamPaperService examPaperService;
/**
+ * 自定义分页,资格审查
+ * @param query page,size
+ * @param apply 考试报名信息对象
+ */
+ @GetMapping("/page-investigate")
+ public R<IPage<ApplyVO>> pageInvestigate(ApplyVO apply, Query query) {
+ IPage<ApplyVO> pages = applyService.selectApplyPage(Condition.getPage(query), apply);
+ return R.data(pages);
+ }
+
+
+ /**
* 自定义分页
* @param query page,size
* @param apply 考试报名信息对象
@@ -95,17 +107,6 @@
*/
@PostMapping("/submit")
public R submit(@RequestBody Apply apply) {
- if (null==apply.getId()){
- //去生成准考证号码
- apply.setCandidateNo(getCandidateNo(apply));
- //去生成考试编号
- apply.setApplyCode(getApplyCode(apply));
- //默认通过
- apply.setApplyStatus(2);
- //默认为未考试状态
- apply.setIsExam(1);
- apply.setApplyTime(new Date());
- }
return R.status(applyService.saveOrUpdate(apply));
}
--
Gitblit v1.9.3