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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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 06971db..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")
@@ -586,7 +586,7 @@
//修改报名信息
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