From 345d17cf82e1bbc1fbfbeec10193c2bed59cd674 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 22:21:21 +0800
Subject: [PATCH] 注册登录，车辆，装备，枪支，招聘，培训考试修改
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
index c1166b1..778edf5 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -293,7 +293,7 @@
//默认为未考试状态
trainingRegistration1.setIsExam(1);
//未提交考试审核
- trainingRegistration.setAuditStatus(4);
+ trainingRegistration1.setAuditStatus(4);
trainingRegistration1.setTrainingTime(new Date());
trainingRegistration1.setUserId(userId);
trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
@@ -311,7 +311,7 @@
//默认为未考试状态
trainingRegistration1.setIsExam(1);
//未提交考试审核
- trainingRegistration.setAuditStatus(4);
+ trainingRegistration1.setAuditStatus(4);
trainingRegistration1.setTrainingTime(new Date());
trainingRegistration1.setUserId(userId);
trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
@@ -538,7 +538,7 @@
/**
- * 生成试卷,报名
+ * 生成试卷,报名，考试申请
* @param trainingRegistrationVo 考试开始时
*/
@PostMapping("/batchExam")
@@ -548,8 +548,7 @@
}else {
//查询已报名的人员前 number 个
//查询已报名未关联试卷的人员,同步报名列表
- List<Long> applyIds = trainingRegistrationService.getTrainIds(trainingRegistrationVo);
- System.out.println("applyIds = " + applyIds);
+ List<TrainingRegistration> applyIds = trainingRegistrationService.getTrainIds(trainingRegistrationVo);
if (applyIds.size()>0){
//生成考试
ExamPaper examPaper = new ExamPaper();
@@ -565,36 +564,40 @@
examPaper.setExamName(examName);
//待审核
examPaper.setAuditStatus(3);
+ //创建时间
+ examPaper.setCreatorDate(new Date());
//生成考试
examPaperService.save(examPaper);
Long sid = examPaper.getId();
String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getStartTime());
String endTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getEndTime());
- String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time,end_time,audit_status) " +
+ String creatorTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getCreatorDate());
+ String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time,end_time,creator_date,audit_status) " +
"values(" + "'" + sid + "'" +
"," + "'" + examPaper.getExamName() + "'" +
"," + "'" + examPaper.getExamType() +"'" +
"," + "'" + format +"'" +
"," + "'" + endTimeFormat +"'" +
+ "," + "'" + creatorTimeFormat +"'" +
"," +"'" + examPaper.getAuditStatus() + "'" + ")";
FtpUtil.sqlFileUpload(s);
//修改报名信息
- applyIds.forEach(id ->{
- TrainingRegistration trainingRegistration = new TrainingRegistration();
- trainingRegistration.setId(id);
- trainingRegistration.setTrainExamId(examPaper.getId().toString());
- //提交考试审核
- trainingRegistration.setAuditStatus(3);
- trainingRegistrationService.updateById(trainingRegistration);
+ applyIds.forEach(trainingRegistration ->{
+ if(null==trainingRegistration.getTrainExamId() || trainingRegistration.getTrainExamId()=="") {
+ trainingRegistration.setTrainExamId(examPaper.getId().toString());
+ //提交考试审核
+ trainingRegistration.setAuditStatus(3);
+ trainingRegistrationService.updateById(trainingRegistration);
- String s1 =
- "update sys_training_registration set train_exam_id = " + "'" + trainingRegistration.getTrainExamId()+ "'"
- +",audit_status = " + "'" + trainingRegistration.getAuditStatus()+ "'"
- + " " +"where id = " + "'" + trainingRegistration.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ String s1 =
+ "update sys_training_registration set train_exam_id = " + "'" + trainingRegistration.getTrainExamId() + "'"
+ + ",audit_status = " + "'" + trainingRegistration.getAuditStatus() + "'"
+ + " " + "where id = " + "'" + trainingRegistration.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ }
});
}
}
--
Gitblit v1.9.3