From 710b1f65394d2077fdb109159d2def32dd3c018c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 03 Sep 2021 18:25:53 +0800
Subject: [PATCH] 培训考试申请修改，日志配置修改
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 105 ++++++++++++++++++++++++++++++----------------------
1 files changed, 61 insertions(+), 44 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 2a3789f..cf6fd53 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -457,12 +457,21 @@
/**
* 生成试卷,报名
* @param ids 报名ids
+ * @param startTime 考试开始时间
+ * @param number 报名人数
+ * @param endTime 截止时间
+ * @param serialStart 报名序号开始
+ * @param serialEnd 报名序号结束
*/
@PostMapping("/batchExam")
public R batchExam(@RequestParam String ids,
String examTime,
@RequestParam Date startTime,
- Date endTime){
+ @RequestParam Integer number,
+ @RequestParam Date endTime,
+ @RequestParam Integer serialStart,
+ @RequestParam Integer serialEnd
+ ){
if (!ids.equals("")){
List<String> list = Arrays.asList(ids.split(","));
if (list.size()>0){
@@ -470,13 +479,13 @@
// examPaper.setExamTime(examTime);
examPaper.setExamType(2);
examPaper.setStartTime(startTime);
-// examPaper.setEndTime(endTime);
+ examPaper.setEndTime(endTime);
Calendar instance = Calendar.getInstance();
instance.setTime(startTime);
int year = instance.get(Calendar.YEAR);
int month = instance.get(Calendar.MONTH)+1;
int day = instance.get(Calendar.DAY_OF_MONTH);
- String examName = year + "年" + month+ "月"+ day +"日" +"保安员证模拟考试";
+ String examName = year + "年" + month+ "月"+ day +"日" +"保安员证培训考试";
examPaper.setExamName(examName);
//待审核
examPaper.setAuditStatus(3);
@@ -485,11 +494,13 @@
Long sid = examPaper.getId();
String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getStartTime());
- String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time,audit_status) " +
+ 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) " +
"values(" + "'" + sid + "'" +
"," + "'" + examPaper.getExamName() + "'" +
"," + "'" + examPaper.getExamType() +"'" +
"," + "'" + format +"'" +
+ "," + "'" + endTimeFormat +"'" +
"," +"'" + examPaper.getAuditStatus() + "'" + ")";
FtpUtil.sqlFileUpload(s);
@@ -506,52 +517,58 @@
FtpUtil.sqlFileUpload(s1);
});
}
-
}else {
- //查询已报名未关联试卷的人员
- List<Long> applyIds = trainingRegistrationService.getTrainIds();
- if (applyIds.size()>0){
- //生成考试
- ExamPaper examPaper = new ExamPaper();
+ if (number==0){
+ return R.data("报名人数不能小于1人");
+ }else {
+ //查询已报名的人员前 number 个
+ //查询已报名未关联试卷的人员
+ List<Long> applyIds = trainingRegistrationService.getTrainIds(number,serialStart,serialEnd);
+ if (applyIds.size()>0){
+ //生成考试
+ ExamPaper examPaper = new ExamPaper();
// examPaper.setExamTime(examTime);
- examPaper.setExamType(2);
- examPaper.setStartTime(startTime);
-// examPaper.setEndTime(endTime);
- Calendar instance = Calendar.getInstance();
- instance.setTime(startTime);
- int year = instance.get(Calendar.YEAR);
- int month = instance.get(Calendar.MONTH)+1;
- int day = instance.get(Calendar.DAY_OF_MONTH);
- String examName = year + "年" + month+ "月"+ day +"日" +"保安员证模拟考试";
- examPaper.setExamName(examName);
- //待审核
- examPaper.setAuditStatus(3);
- //生成考试
- examPaperService.save(examPaper);
+ examPaper.setExamType(2);
+ examPaper.setStartTime(startTime);
+ examPaper.setEndTime(endTime);
+ Calendar instance = Calendar.getInstance();
+ instance.setTime(startTime);
+ int year = instance.get(Calendar.YEAR);
+ int month = instance.get(Calendar.MONTH)+1;
+ int day = instance.get(Calendar.DAY_OF_MONTH);
+ String examName = year + "年" + month+ "月"+ day +"日" +"保安员证培训考试";
+ examPaper.setExamName(examName);
+ //待审核
+ examPaper.setAuditStatus(3);
+ //生成考试
+ examPaperService.save(examPaper);
- Long sid = examPaper.getId();
- String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getStartTime());
- String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time,audit_status) " +
- "values(" + "'" + sid + "'" +
- "," + "'" + examPaper.getExamName() + "'" +
- "," + "'" + examPaper.getExamType() +"'" +
- "," + "'" + format +"'" +
- "," +"'" + examPaper.getAuditStatus() + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+ 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) " +
+ "values(" + "'" + sid + "'" +
+ "," + "'" + examPaper.getExamName() + "'" +
+ "," + "'" + examPaper.getExamType() +"'" +
+ "," + "'" + format +"'" +
+ "," + "'" + endTimeFormat +"'" +
+ "," +"'" + examPaper.getAuditStatus() + "'" + ")";
+ FtpUtil.sqlFileUpload(s);
- //修改报名信息
- applyIds.forEach(id ->{
- TrainingRegistration trainingRegistration = new TrainingRegistration();
- trainingRegistration.setId(id);
- trainingRegistration.setTrainExamId(examPaper.getId().toString());
- trainingRegistrationService.updateById(trainingRegistration);
+ //修改报名信息
+ applyIds.forEach(id ->{
+ TrainingRegistration trainingRegistration = new TrainingRegistration();
+ trainingRegistration.setId(id);
+ trainingRegistration.setTrainExamId(examPaper.getId().toString());
+ trainingRegistrationService.updateById(trainingRegistration);
- String s1 =
- "update sys_training_registration set train_exam_id = " + "'" + trainingRegistration.getTrainExamId()+ "'"
- + " " +"where id = " + "'" + trainingRegistration.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
- });
+ String s1 =
+ "update sys_training_registration set train_exam_id = " + "'" + trainingRegistration.getTrainExamId()+ "'"
+ + " " +"where id = " + "'" + trainingRegistration.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ });
+ }
}
}
return null;
--
Gitblit v1.9.3