From 2b7013958fc02dd1d41b780d08768636df4e5c1f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 07 Sep 2021 14:11:25 +0800
Subject: [PATCH] 考试报名列表接口修改，考试生成修改
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 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..586817b 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -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();
@@ -582,19 +581,19 @@
//修改报名信息
- 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