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/apply/controller/ApplyController.java | 113 ++++++++++++++++++--------------------------------------
1 files changed, 36 insertions(+), 77 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
index 3055948..24f8b40 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -32,6 +32,7 @@
import org.springblade.modules.exam.service.ExamScoreService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.training.vo.TrainingRegistrationVo;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -604,43 +605,43 @@
/**
* 生成考试,报名
- * @param ids 报名ids
+ * @param applyVO 报名info
*/
@PostMapping("/batchExam")
- public R batchExam(@RequestParam String ids,
- String examTime,
- @RequestParam Date startTime,
- @RequestParam Integer number,
- Date endTime){
- if (!ids.equals("")){
- List<String> list = Arrays.asList(ids.split(","));
- if (list.size()>0){
- ExamPaper examPaper = new ExamPaper();
-// examPaper.setExamTime(examTime);
- examPaper.setExamType(1);
- 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);
- //生成考试
- examPaperService.save(examPaper);
+ public R batchExam(@RequestBody ApplyVO applyVO){
+ //查询已报名未关联试卷的人员
+ List<Apply> applyIds = applyService.getApplyIds(applyVO);
+ if (applyIds.size()>0){
+ //生成考试
+ ExamPaper examPaper = new ExamPaper();
+ examPaper.setExamType(1);
+ examPaper.setStartTime(applyVO.getStartTime());
+ examPaper.setEndTime(applyVO.getEndTime());
+ Calendar instance = Calendar.getInstance();
+ instance.setTime(applyVO.getStartTime());
+ 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);
+ //生成考试
+ 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) " +
- "values(" + "'" + sid + "'" + "," + "'" + examPaper.getExamName() + "'" + "," + "'" + examPaper.getExamType() +
- "'" + "," +"'" + format + "'" + ")";
- 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.getStartTime());
+ String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time,end_time) " +
+ "values(" + "'" + sid + "'" +
+ "," + "'" + examPaper.getExamName() + "'" +
+ "," + "'" + examPaper.getExamType() +"'" +
+ "," + "'" + format +"'" +
+ "," +"'" + endTimeFormat + "'" + ")";
+ FtpUtil.sqlFileUpload(s);
- //修改报名信息
- list.forEach(id ->{
- Apply apply = new Apply();
- apply.setId(Long.parseLong(id));
+ //修改报名信息
+ applyIds.forEach(apply ->{
+ //如果查出来的是已存在考试信息数据，则跳过
+ if (null==apply.getExamId()){
apply.setExamId(examPaper.getId());
apply.setCandidateNo(getCandidateNo(apply));
applyService.updateById(apply);
@@ -649,50 +650,8 @@
"update sys_apply set exam_id = " + apply.getExamId() + ",candidate_no = " + "'" + apply.getCandidateNo() + "'" +
" " +"where id = " + "'" + apply.getId() + "'";
FtpUtil.sqlFileUpload(s1);
- });
- }
-
- }else {
- //查询已报名未关联试卷的人员
- List<Long> applyIds = applyService.getApplyIds(number);
- if (applyIds.size()>0){
- //生成考试
- ExamPaper examPaper = new ExamPaper();
-// examPaper.setExamTime(examTime);
- examPaper.setExamType(1);
- 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);
- //生成考试
- 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) " +
- "values(" + "'" + sid + "'" + "," + "'" + examPaper.getExamName() + "'" + "," + "'" + examPaper.getExamType() +
- "'" + "," +"'" + format + "'" + ")";
- FtpUtil.sqlFileUpload(s);
-
- //修改报名信息
- applyIds.forEach(id ->{
- Apply apply = new Apply();
- apply.setId(id);
- apply.setExamId(examPaper.getId());
- apply.setCandidateNo(getCandidateNo(apply));
- applyService.updateById(apply);
-
- String s1 =
- "update sys_apply set exam_id = " + apply.getExamId() + ",candidate_no = " + "'" + apply.getCandidateNo() + "'" +
- " " +"where id = " + "'" + apply.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
- });
- }
+ }
+ });
}
return null;
}
--
Gitblit v1.9.3