From 9a4a283a1413188ff5763b5e2e72c26bc2f5db3d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 08 Oct 2021 14:19:55 +0800
Subject: [PATCH] 准考证生成修改
---
src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 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 07eda97..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
@@ -46,9 +46,12 @@
@Override
public IPage<TrainingRegistrationVo> selectTrainingRegistrationPage(IPage<TrainingRegistrationVo> page, TrainingRegistrationVo trainingRegistration) {
List<TrainingRegistrationVo> trainingRegistrationVos = baseMapper.selectTrainingRegistrationPage(page, trainingRegistration);
-// trainingRegistrationVos.forEach(trainingRegistrationVo -> {
-// trainingRegistrationVo.setRemainingTime(LongTimeUtil.getDistanceTime(trainingRegistrationVo.getTrainExamTime().getTime(), System.currentTimeMillis()));
-// });
+ trainingRegistrationVos.forEach(trainingRegistrationVo -> {
+ //如果考试id 为空,考试尚未提交审核
+ if (null==trainingRegistrationVo.getAuditStatus()){
+ trainingRegistrationVo.setAuditStatus(4);
+ }
+ });
return page.setRecords(trainingRegistrationVos);
}
@@ -95,6 +98,7 @@
trainingRegistration.setIsExam(1);
trainingRegistration.setCancel(1);
trainingRegistration.setTrainingTime(new Date());
+ trainingRegistration.setAuditStatus(4);
//如果examId不为空
if (null!=examId){
//查询考试信息
@@ -104,6 +108,15 @@
if (examPaper.getAuditStatus()==1){
//生成准考证号
trainingRegistration.setCandidateNo(getCandidateNo(trainingRegistration));
+ trainingRegistration.setAuditStatus(1);
+ }
+ //考试审核不通过
+ if (examPaper.getAuditStatus()==2){
+ trainingRegistration.setAuditStatus(2);
+ }
+ //考试待审核
+ if (examPaper.getAuditStatus()==3){
+ trainingRegistration.setAuditStatus(3);
}
}
//新增报名
@@ -120,6 +133,7 @@
trainingRegistration.setIsExam(1);
trainingRegistration.setCancel(1);
trainingRegistration.setTrainingTime(new Date());
+ trainingRegistration.setAuditStatus(4);
//如果examId不为空
if (null!=examId){
//查询考试信息
@@ -176,6 +190,8 @@
}
if (month<=9){
months = "0" + month;
+ }else {
+ months = String.valueOf(month);
}
if (day<=9){
days = "0" + day;
@@ -201,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;
}
@@ -224,13 +240,14 @@
private void saveTrainingRegistration(TrainingRegistration trainingRegistration,User user1){
String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
Long id = trainingRegistration.getId();
- String s = "insert into sys_training_registration(id,training_unit_id,training_time,cancel,user_id,is_exam) " +
+ String s = "insert into sys_training_registration(id,training_unit_id,training_time,cancel,user_id,is_exam,audit_status) " +
"values(" + "'" + id + "'"
+ "," + "'" + trainingRegistration.getTrainingUnitId() +"'"
+ "," + "'" + formatStr +"'"
+ "," + "'" + trainingRegistration.getCancel() + "'"
+ "," + "'" + trainingRegistration.getUserId() + "'"
- + "," +"'" + trainingRegistration.getIsExam() + "'" + ");" +
+ + "," + "'" + trainingRegistration.getIsExam() + "'"
+ + "," +"'" + trainingRegistration.getAuditStatus() + "'" + ");" +
"update blade_user set is_train = " + user1.getIsTrain() + " " +"where id = " + "'" + user1.getId() + "'";
FtpUtil.sqlFileUpload(s);
}
@@ -261,7 +278,9 @@
* @return
*/
@Override
- public List<Long> getTrainIds() {
- return baseMapper.getTrainIds();
+ 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