From 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 18 Sep 2021 17:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 335ebff..2c15125 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 考试报名信息对象
@@ -102,6 +114,8 @@
apply.setApplyCode(getApplyCode(apply));
//默认通过
apply.setApplyStatus(2);
+ //默认为未考试状态
+ apply.setIsExam(1);
apply.setApplyTime(new Date());
}
return R.status(applyService.saveOrUpdate(apply));
--
Gitblit v1.9.3