From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
index 87105ee..622cd85 100644
--- a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
+++ b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
@@ -20,8 +20,11 @@
import org.springblade.modules.exam.util.SecurityPaperUtil;
import org.springblade.modules.exam.vo.ExamResultVO;
import org.springblade.modules.exam.vo.ExamScoreVO;
+import org.springblade.modules.system.entity.Role;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IRoleService;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.training.entity.TrainingRegistration;
import org.springblade.modules.training.service.TrainingRegistrationService;
import org.springframework.stereotype.Service;
@@ -52,6 +55,8 @@
private final TrainingRegistrationService trainingRegistrationService;
+ private final IRoleService roleService;
+
/**
* 自定义分页数据
* @param page 分页条件
@@ -60,6 +65,14 @@
*/
@Override
public IPage<ExamScoreVO> selectExamScorePage(IPage<ExamScoreVO> page, ExamScoreVO examScore) {
+ if (null!=examScore.getExamType()){
+ if (examScore.getExamType()==1){
+ return page.setRecords(baseMapper.selectExamScorePage(page, examScore));
+ }
+ if (examScore.getExamType()==2){
+ return page.setRecords(baseMapper.selectTrainExamScorePage(page, examScore));
+ }
+ }
return page.setRecords(baseMapper.selectExamScorePage(page, examScore));
}
@@ -126,11 +139,19 @@
}
//获取考试信息
ExamPaper paper = examPaperService.getById(examScore.getPapersId());
+ int age = 0;
+ UserVO user = new UserVO();
//使用准考证号查询报名信息，修改考试状态为已考试
if(paper.getExamType()==1){
Apply apply = new Apply();
apply.setCandidateNo(examScore.getCandidateNo());
Apply apply1 = applyService.getOne(Condition.getQueryWrapper(apply));
+ //查询用户年龄，根据年龄计算总分
+ user = userService.getUserAgeById(apply1.getUserId());
+ //修改用户的考试状态,理论考试结束
+ user.setIsApply(3);
+ userService.updateById(user);
+ age = user.getAge();
//修改为已考试
apply1.setIsExam(2);
applyService.updateById(apply1);
@@ -140,24 +161,36 @@
TrainingRegistration trainingRegistration = new TrainingRegistration();
trainingRegistration.setCandidateNo(examScore.getCandidateNo());
TrainingRegistration trainingRegistration1 = trainingRegistrationService.getOne(Condition.getQueryWrapper(trainingRegistration));
+ //查询用户年龄，根据年龄计算总分
+ user = userService.getUserAgeById(Long.parseLong(trainingRegistration1.getUserId()));
+ //修改用户的培训状态,理论考试结束
+ user.setIsTrain(3);
+ age = user.getAge();
+ userService.updateById(user);
//修改为已考试
trainingRegistration1.setIsExam(2);
trainingRegistrationService.updateById(trainingRegistration1);
}
+
//设置考试ID
examScore.setExamId(examScore.getPapersId().toString());
//设置理论得分
examScore.setTheoryGrade(theoryGrade);
//计算总成绩,此时没有实操成绩，总成绩为实操成绩和理论成绩和的一半
- examScore.setAllGrade(Math.round(theoryGrade/2));
+ if (age<=50) {
+ examScore.setAllGrade(Math.round(theoryGrade / 2));
+ }
+ if (age>50) {
+ examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(theoryGrade*0.3))));
+ }
//设置状态
if (theoryGrade>=60){
examScore.setQualified(2);
}else {
examScore.setQualified(1);
}
- //保存成绩数据
- int i = baseMapper.insert(examScore);
+ //修改成绩数据
+ int i = baseMapper.updateById(examScore);
//修改考试状态
if (i>0){
@@ -184,6 +217,8 @@
//查询出成绩数据
ExamScore examScore = baseMapper.getExamScoreInfoByIdCardNo(examScoreExcel.getIdCardNo(),examPaper.getId());
if (null!=examScore) {
+ //查询当前保安信息
+ UserVO user = userService.getUserAgeById(Long.parseLong(examScore.getUserId()));
examScore.setLearnGrade(examScoreExcel.getLearnGrade());
if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() >= 60) {
//合格
@@ -191,8 +226,7 @@
//正式考试通过生成保安证编号
if (examPaper.getExamType()==1) {
//去生成保安证编号
- //查询当前保安信息
- User user = userService.getById(examScore.getUserId());
+
String pre = SecurityPaperUtil.getSecurityPaper();
//查询当前年份已有的保安证编号
int count = userService.getSecurityPaperCount(pre);
@@ -205,6 +239,13 @@
result = pre + (decimalFormat.format(count++));
}
user.setSecuritynumber(result);
+ //修改为持证保安
+ user.setHold("1");
+ //分配保安角色
+ Role role = new Role();
+ role.setRoleAlias("保安");
+ Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
+ user.setRoleId(oneRole.getId().toString());
//更新保安数据
userService.updateById(user);
}
@@ -213,7 +254,13 @@
examScore.setQualified(1);
}
//总成绩
- examScore.setAllGrade(Math.round((examScore.getTheoryGrade()+examScoreExcel.getLearnGrade())/2));
+ if (user.getAge()<=50) {
+ examScore.setAllGrade(Math.round((examScore.getTheoryGrade()+examScoreExcel.getLearnGrade())/2));
+ }
+ if (user.getAge()>50) {
+ examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(examScore.getTheoryGrade()*0.3)))
+ + Integer.parseInt(String.valueOf(Math.round(examScoreExcel.getLearnGrade()*0.7))));
+ }
//更新成绩数据
baseMapper.updateById(examScore);
}
--
Gitblit v1.9.3