From d933448be36d77173a9039fe0c8d210d4e76798c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sun, 18 Jul 2021 15:51:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 c1357d3..b6f12c7 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -87,6 +87,8 @@
if (null==apply.getId()){
//去生成准考证
apply.setCandidateNo(getCandidateNo(apply));
+ //默认通过
+ apply.setApplyStatus(2);
}
return R.status(applyService.saveOrUpdate(apply));
}
@@ -128,7 +130,7 @@
String examName
= examPaper.getExamName().replaceAll("\\s*", "").replaceAll("[^(\\u4e00-\\u9fa5)]", "").substring(0,1);
- //前缀
+ //前缀 = 年的最后两位 + 月份（两位） + 考试名称（中文拼音）首字母（去除数字，字母） + 考试类型 + 季度拼音首字母大写（春季就是 C）
String result = year
+ months
+ toFirstChar(examName).toUpperCase()
--
Gitblit v1.9.3