From 60a09b74e2091c49da33c000c9e4b61e2cdd237b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sun, 18 Jul 2021 15:50:48 +0800
Subject: [PATCH] 报名考试查询接口修改
---
src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml | 4 +++-
src/main/java/org/springblade/modules/apply/vo/ApplyVO.java | 5 +++++
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 4 +++-
3 files changed, 11 insertions(+), 2 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()
diff --git a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
index c2b4ab3..2a98cfc 100644
--- a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
@@ -5,7 +5,9 @@
<!--考试报名分页信息-->
<select id="selectApplyPage" resultType="org.springblade.modules.apply.vo.ApplyVO">
SELECT
- sa.*,ke.total_score paperScore,ke.exam_type examType,ke.start_time startTime
+ sa.id,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
+ ke.total_score paperScore,ke.exam_type examType,ke.start_time examTime,ke.exam_name examName,
+ bu.real_name name
FROM
sys_apply sa
left join
diff --git a/src/main/java/org/springblade/modules/apply/vo/ApplyVO.java b/src/main/java/org/springblade/modules/apply/vo/ApplyVO.java
index d77349f..9a27c51 100644
--- a/src/main/java/org/springblade/modules/apply/vo/ApplyVO.java
+++ b/src/main/java/org/springblade/modules/apply/vo/ApplyVO.java
@@ -50,4 +50,9 @@
private Integer examType;
+ /**
+ * 考试名称
+ */
+ private String examName;
+
}
--
Gitblit v1.9.3