From 54ef548d58771a5ceaf8e83543bf76d80d051fd7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 12 Nov 2021 12:41:20 +0800
Subject: [PATCH] 培训导入，成绩导入新增测试导入，用户查询修改
---
src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java | 91 +++++++++++++++++++++++++++++++++++----------
1 files changed, 70 insertions(+), 21 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..7634a6a 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
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.api.R;
import org.springblade.modules.FTP.FtpUtil;
@@ -24,7 +26,9 @@
import org.springframework.transaction.annotation.Transactional;
import java.text.DecimalFormat;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -46,9 +50,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);
}
@@ -80,8 +87,33 @@
@Transactional(rollbackFor = Exception.class)
public void importTrainingRegistration(List<TrainingRegistrationExcel> data, Boolean isCovered,Long examId) {
if (data.size()>0){
+ List<String> list = new ArrayList<>();
data.forEach(trainingRegistrationExcel -> {
TrainingRegistration trainingRegistration = new TrainingRegistration();
+// User user = userService.getUserInfoByIdCardNo(trainingRegistrationExcel.getIdCardNo());
+// //通过培训公司查组织机构id
+// if (null!=trainingRegistrationExcel.getDeptName() && trainingRegistrationExcel.getDeptName()!=""){
+// trainingRegistration.setTrainingUnitId(userDeptService.selectIn(trainingRegistrationExcel.getDeptName()));
+// }
+// trainingRegistration.setIsExam(2);
+// trainingRegistration.setCancel(1);
+// trainingRegistration.setTrainingTime(new Date());
+// trainingRegistration.setAuditStatus(1);
+// try {
+// trainingRegistration.setTrainingTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse("2021-10-07 15:13:12"));
+// } catch (ParseException e) {
+// e.printStackTrace();
+// }
+// ExamPaper paper = examPaperService.getById(120);
+// //生成准考证号
+// trainingRegistration.setCandidateNo(getCandidateNo(paper));
+// trainingRegistration.setTrainExamId(paper.getId().toString());
+// if (null!=user) {
+// trainingRegistration.setUserId(user.getId().toString());
+// this.save(trainingRegistration);
+// }else {
+// list.add(trainingRegistrationExcel.getIdCardNo());
+// }
//通过身份证号
if (null!=trainingRegistrationExcel.getIdCardNo() && trainingRegistrationExcel.getIdCardNo()!=""){
User user = userService.getUserInfoByIdCardNo(trainingRegistrationExcel.getIdCardNo());
@@ -95,6 +127,7 @@
trainingRegistration.setIsExam(1);
trainingRegistration.setCancel(1);
trainingRegistration.setTrainingTime(new Date());
+ trainingRegistration.setAuditStatus(4);
//如果examId不为空
if (null!=examId){
//查询考试信息
@@ -103,7 +136,16 @@
//审核通过
if (examPaper.getAuditStatus()==1){
//生成准考证号
- trainingRegistration.setCandidateNo(getCandidateNo(trainingRegistration));
+ trainingRegistration.setCandidateNo(getCandidateNo(examPaper));
+ trainingRegistration.setAuditStatus(1);
+ }
+ //考试审核不通过
+ if (examPaper.getAuditStatus()==2){
+ trainingRegistration.setAuditStatus(2);
+ }
+ //考试待审核
+ if (examPaper.getAuditStatus()==3){
+ trainingRegistration.setAuditStatus(3);
}
}
//新增报名
@@ -120,6 +162,7 @@
trainingRegistration.setIsExam(1);
trainingRegistration.setCancel(1);
trainingRegistration.setTrainingTime(new Date());
+ trainingRegistration.setAuditStatus(4);
//如果examId不为空
if (null!=examId){
//查询考试信息
@@ -128,7 +171,7 @@
//审核通过
if (examPaper.getAuditStatus()==1){
//生成准考证号
- trainingRegistration.setCandidateNo(getCandidateNo(trainingRegistration));
+ trainingRegistration.setCandidateNo(getCandidateNo(examPaper));
}
}
//新增报名
@@ -143,17 +186,18 @@
}
}
});
+ String errorAccount = StringUtils.join(list, "\\\n");
+ throw new ServiceException("未导入成功"+errorAccount);
}
}
/**
* 生成准考证号码
- * @param trainingRegistration 考试报名信息对象
+ * @param examPaper 考试报名信息对象
*/
- private String getCandidateNo(TrainingRegistration trainingRegistration) {
+ private String getCandidateNo(ExamPaper examPaper) {
//获取考试信息
- ExamPaper examPaper = examPaperService.getById(trainingRegistration.getTrainExamId());
if (null!=examPaper.getStartTime()){
String format = new SimpleDateFormat("yyyy-MM-dd").format(examPaper.getStartTime());
String year = format.substring(2,4);
@@ -176,6 +220,8 @@
}
if (month<=9){
months = "0" + month;
+ }else {
+ months = String.valueOf(month);
}
if (day<=9){
days = "0" + day;
@@ -190,8 +236,8 @@
type = "m";
}
//获取考试名称前缀,去除数字，字母
- String examName
- = examPaper.getExamName().replaceAll("\\s*", "").replaceAll("[^(\\u4e00-\\u9fa5)]", "").substring(0,1);
+// String examName
+// = examPaper.getExamName().replaceAll("\\s*", "").replaceAll("[^(\\u4e00-\\u9fa5)]", "").substring(0,1);
//前缀 = 年的最后两位 + 月份（两位） + 考试名称（中文拼音）首字母（去除数字，字母） + 考试类型 + 季度拼音首字母大写（春季就是 C）
// String result = year
@@ -201,19 +247,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 +270,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 +308,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