From cb04ed62736efe70cf5babe534220b4ae4c1ca67 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 20 Jan 2022 21:08:42 +0800
Subject: [PATCH] 1. 定时任务调整 2. 成绩修改审核通过修改状态调整 3. 考试统计查询修改
---
src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java b/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
index a113f9f..a21e5f4 100644
--- a/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
@@ -14,7 +14,9 @@
import org.springblade.modules.apply.entity.Apply;
import org.springblade.modules.apply.excel.ApplyInfoExcel;
import org.springblade.modules.exam.entity.ExamPaper;
+import org.springblade.modules.exam.entity.ExamScore;
import org.springblade.modules.exam.service.ExamPaperService;
+import org.springblade.modules.exam.service.ExamScoreService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserDeptService;
import org.springblade.modules.system.service.IUserService;
@@ -50,6 +52,8 @@
private final AbsentRecordsService absentRecordsService;
+ private final ExamScoreService examScoreService;
+
@Override
public IPage<TrainingRegistrationVo> selectTrainingRegistrationPage(IPage<TrainingRegistrationVo> page, TrainingRegistrationVo trainingRegistration) {
@@ -78,7 +82,7 @@
* @return
*/
@Override
- public List<ApplyInfoExcel> getTrainingRegistrationExcelList(TrainingRegistrationVo trainingRegistration) {
+ public List<TrainingRegistrationExcel> getTrainingRegistrationExcelList(TrainingRegistrationVo trainingRegistration) {
return baseMapper.getTrainingRegistrationExcelList(trainingRegistration);
}
@@ -342,13 +346,14 @@
//考试截止时间小于当前时间，说明已过考试时间
if (exanEndTime.before(now)) {
//修改报名状态
- trainingRegistration1.setCancel(2);
+ trainingRegistration1.setCancel(1);
//缺考标记
trainingRegistration1.setIsExam(4);
this.updateById(trainingRegistration1);
//修改保安报名状态
User user = userService.getById(trainingRegistration1.getUserId());
- user.setIsTrain(2);
+ //考试结束
+ user.setIsTrain(3);
userService.updateById(user);
//生成缺考记录
AbsentRecords absentRecords = new AbsentRecords();
@@ -360,19 +365,40 @@
//新增
absentRecordsService.save(absentRecords);
+ //新增成绩，成绩为0
+ ExamScore examScore = new ExamScore();
+ examScore.setCandidateNo(trainingRegistration1.getCandidateNo());
+ examScore.setTheoryGrade(0);
+ examScore.setAllGrade(0);
+ examScore.setQualified(3);
+ examScore.setUserId(user.getId().toString());
+ examScore.setApplyId(trainingRegistration1.getId());
+ examScore.setExamId(trainingRegistration1.getTrainExamId());
+ //新增
+ examScoreService.save(examScore);
+
//内网同步
String s =
"update sys_training_registration set cancel = " + trainingRegistration1.getCancel() +
",is_exam = " + "'" + trainingRegistration1.getIsExam() + "'" +
" " + "where id = " + "'" + trainingRegistration1.getId() + "';" +
- "update blade_user set is_train = " + user.getIsTrain() + " " + "where id = " + "'" + user.getId() + "';" +
- "insert into sys_absent_records(id,user_id,create_time,exam_id,apply_id,candidate_no) " +
+ "update blade_user set is_train = " + user.getIsTrain() + " " + "where id = " + "'" + user.getId() + "';" +
+ "insert into sys_absent_records(id,user_id,create_time,exam_id,apply_id,candidate_no) " +
"values(" + "'" + absentRecords.getId() + "'" + ","
+ "'" + absentRecords.getUserId() + "'" + ","
+ "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(absentRecords.getCreateTime()) + "'" + ","
+ "'" + absentRecords.getExamId() + "'" + ","
+ "'" + absentRecords.getApplyId() + "'" + ","
- + "'" + absentRecords.getCandidateNo() + "'" + ")";
+ + "'" + absentRecords.getCandidateNo() + "'" + ");" +
+ "insert into exam_score(id,candidate_no,theory_grade,all_grade,qualified,user_id,apply_id,exam_id) " +
+ "values(" + "'" + examScore.getId() + "'" + ","
+ + "'" + examScore.getCandidateNo() + "'" + ","
+ + "'" + examScore.getTheoryGrade() + "'" + ","
+ + "'" + examScore.getAllGrade() + "'" + ","
+ + "'" + examScore.getQualified() + "'" + ","
+ + "'" + examScore.getUserId() + "'" + ","
+ + "'" + examScore.getApplyId() + "'" + ","
+ + "'" + examScore.getExamId() + "'" + ")";
FtpUtil.sqlFileUpload(s);
}
}
--
Gitblit v1.9.3