From 7c9742190965b22f4ea3864aa8588fad19e0be58 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 29 Sep 2021 20:27:18 +0800
Subject: [PATCH] 培训审核查询修改
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 586817b..08c64b8 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")
@@ -562,27 +562,33 @@
int day = instance.get(Calendar.DAY_OF_MONTH);
String examName = year + "年" + month+ "月"+ day +"日" +"保安员证培训考试";
examPaper.setExamName(examName);
+ examPaper.setCreator(trainingRegistrationVo.getCreator());
//待审核
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,creator_date,audit_status) " +
"values(" + "'" + sid + "'" +
"," + "'" + examPaper.getExamName() + "'" +
"," + "'" + examPaper.getExamType() +"'" +
"," + "'" + format +"'" +
"," + "'" + endTimeFormat +"'" +
+ "," + "'" + examPaper.getCreator() +"'" +
+ "," + "'" + creatorTimeFormat +"'" +
"," +"'" + examPaper.getAuditStatus() + "'" + ")";
FtpUtil.sqlFileUpload(s);
//修改报名信息
applyIds.forEach(trainingRegistration ->{
- if(null==trainingRegistration.getTrainExamId() && trainingRegistration.getTrainExamId()=="") {
+ if(null==trainingRegistration.getTrainExamId() || trainingRegistration.getTrainExamId()=="") {
trainingRegistration.setTrainExamId(examPaper.getId().toString());
//提交考试审核
trainingRegistration.setAuditStatus(3);
--
Gitblit v1.9.3