From 37e8b95d39c30dd0f59d2dcc2b73fb64ee493a42 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 27 Oct 2021 15:38:36 +0800
Subject: [PATCH] 保安员新增修改接口修改
---
src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java b/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
index 9bcd15c..916ae0e 100644
--- a/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
@@ -98,7 +98,7 @@
trainingRegistration.setIsExam(1);
trainingRegistration.setCancel(1);
trainingRegistration.setTrainingTime(new Date());
- trainingRegistration.setAuditStatus(3);
+ trainingRegistration.setAuditStatus(4);
//如果examId不为空
if (null!=examId){
//查询考试信息
@@ -133,6 +133,7 @@
trainingRegistration.setIsExam(1);
trainingRegistration.setCancel(1);
trainingRegistration.setTrainingTime(new Date());
+ trainingRegistration.setAuditStatus(4);
//如果examId不为空
if (null!=examId){
//查询考试信息
@@ -189,6 +190,8 @@
}
if (month<=9){
months = "0" + month;
+ }else {
+ months = String.valueOf(month);
}
if (day<=9){
days = "0" + day;
@@ -214,19 +217,19 @@
// + quarter;
//前缀 = 年的最后两位 + 月份（两位） + 日 （两位） + 考试类型 正式考试 z 模拟考试 m
- String result = year
+ String pre = year
+ months
+ days
+ type;
- //查询是当前前缀已生成的数量
- int count = this.getCandidateNoCount(result);
- if (count==0){
- return result + "0000";
- }
+ //查询是当前前缀已生成准考证号码最大的一位
+ int count = examPaperService.getCandidateNoCount(pre);
+ String result = null;
//格式化
DecimalFormat decimalFormat = new DecimalFormat("0000");
+ count++;
+ result = pre + (decimalFormat.format(count));
//返回
- return result + (decimalFormat.format(count++));
+ return result;
}
return null;
}
@@ -275,7 +278,7 @@
* @return
*/
@Override
- public List<Long> getTrainIds(TrainingRegistrationVo trainingRegistrationVo) {
+ public List<TrainingRegistration> getTrainIds(TrainingRegistrationVo trainingRegistrationVo) {
trainingRegistrationVo.setSerialStart(trainingRegistrationVo.getSerialStart() -1);
trainingRegistrationVo.setSerialEnd(trainingRegistrationVo.getSerialEnd() -trainingRegistrationVo.getSerialStart());
return baseMapper.getTrainIds(trainingRegistrationVo);
--
Gitblit v1.9.3