From 5cceb01ea15fa807ebe0011c5b38780cb3e3e2c3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 12 Nov 2021 23:50:26 +0800
Subject: [PATCH] 部门数菜单修改，考试审核修改
---
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 193 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 167 insertions(+), 26 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 cc973d8..77273b8 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
@@ -4,18 +4,18 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.common.utils.arg;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.apply.entity.Apply;
import org.springblade.modules.apply.service.ApplyService;
-import org.springblade.modules.exam.entity.ExamExaminationSubject;
-import org.springblade.modules.exam.entity.ExamPaper;
-import org.springblade.modules.exam.entity.ExamScore;
-import org.springblade.modules.exam.entity.ExamSubjectChoices;
+import org.springblade.modules.exam.entity.*;
import org.springblade.modules.exam.excel.ExamScoreExcel;
import org.springblade.modules.exam.excel.ExportExamScoreExcel;
import org.springblade.modules.exam.mapper.ExamScoreMapper;
+import org.springblade.modules.exam.service.ExamAnswerRecordService;
import org.springblade.modules.exam.service.ExamPaperService;
import org.springblade.modules.exam.service.ExamScoreService;
import org.springblade.modules.exam.service.ExamSubjectChoicesService;
@@ -37,10 +37,8 @@
import java.text.DecimalFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
import static com.bstek.ureport.expression.model.condition.Join.and;
@@ -68,6 +66,10 @@
@Autowired
private IRoleService roleService;
+
+
+ @Autowired
+ private ExamAnswerRecordService examAnswerRecordService;
/**
* 自定义分页数据
@@ -245,12 +247,26 @@
@Override
public void importExamScore(List<ExamScoreExcel> examScoreExcelList, Boolean isCovered) {
if (examScoreExcelList.size()>0){
+ List<Object> errorList = new ArrayList<>();
+ //导入状态，默认为true ,如果有一个出现问题则为 false
+ AtomicBoolean status = new AtomicBoolean(true);
+ //遍历
examScoreExcelList.forEach(examScoreExcel -> {
if (null!=examScoreExcel.getLearnGrade() && null!=examScoreExcel.getIdCardNo() && examScoreExcel.getIdCardNo()!=""){
//使用考试名称匹配考试信息
- ExamPaper examPaper = examPaperService.getExamInfoByExamName(examScoreExcel.getExamName());
+// ExamPaper examPaper = examPaperService.getExamInfoByExamName(examScoreExcel.getExamName());
//查询出成绩数据
- ExamScore examScore = baseMapper.getExamScoreInfoByIdCardNo(examScoreExcel.getIdCardNo(),examPaper.getId());
+// ExamScore examScore = baseMapper.getExamScoreInfoByIdCardNo(examScoreExcel.getIdCardNo(),examPaper.getId());
+ //根据身份证号查询用户
+ User user0 = userService.getUserInfoByIdCardNo(examScoreExcel.getIdCardNo());
+ if (null==user0){
+ throw new ServiceException("用户:["+examScoreExcel.getIdCardNo()+"]不存在");
+ }
+ ExamScore examScore1 = new ExamScore();
+ examScore1.setCandidateNo(examScoreExcel.getCandidateNo());
+ examScore1.setUserId(user0.getId().toString());
+ //根据准考证号和用户id查询考试成绩
+ ExamScore examScore = this.getOne(Condition.getQueryWrapper(examScore1));
if (null!=examScore) {
//查询当前保安信息
UserVO user = userService.getUserAgeById(Long.parseLong(examScore.getUserId()));
@@ -258,8 +274,12 @@
if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() >= 60) {
//合格
examScore.setQualified(0);
+ //修改制证状态为未制证
+ user.setUserType(7);
//正式考试通过生成保安证编号
- if (examPaper.getExamType()==1) {
+// if (examPaper.getExamType()==1) {
+ //如果已有保安证编号，不更新用户信息
+ if (null==user.getSecuritynumber() || user.getSecuritynumber().equals("")) {
//去生成保安证编号
String pre = SecurityPaperUtil.getSecurityPaper();
//查询当前年份已有的保安证编号
@@ -275,35 +295,44 @@
}
user.setSecuritynumber(result);
//发证日期
- user.setPaperTime(new Date());
+// user.setPaperTime(new Date());
//修改为持证保安
user.setHold("1");
- //分配保安角色
-// Role role = new Role();
-// role.setRoleAlias("保安");
-// Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
-// user.setRoleId(oneRole.getId().toString());
//更新保安数据
userService.updateById(user);
String s1 =
- "update blade_user set hold = " + "'" + user.getHold() + "'" +
+ "update blade_user set hold = " + "'" + user.getHold() + "'" +
",securitynumber = " + "'" + user.getSecuritynumber() + "'" +
- ",paper_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime()) + "'" +
- " " +"where id = " + "'" + user.getId() + "'";
+ ",user_type = " + "'" + user.getUserType() + "'" +
+ " " + "where id = " + "'" + user.getId() + "'";
FtpUtil.sqlFileUpload(s1);
}
+ //分配保安角色
+// Role role = new Role();
+// role.setRoleAlias("保安");
+// Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
+// user.setRoleId(oneRole.getId().toString());
+// }
} else {
//不合格
examScore.setQualified(1);
}
//总成绩
- if (user.getAge()<=50) {
- examScore.setAllGrade(Math.round((examScore.getTheoryGrade()+examScoreExcel.getLearnGrade())/2));
+ if (user.getAge() <= 50) {
+ if (null!=examScore.getTheoryGrade()) {
+ examScore.setAllGrade(Math.round((examScore.getTheoryGrade() + examScoreExcel.getLearnGrade()) / 2));
+ }else {
+ examScore.setAllGrade(Math.round(examScoreExcel.getLearnGrade() / 2));
+ }
}
- if (user.getAge()>50) {
- examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(examScore.getTheoryGrade()*0.5)))
- + Integer.parseInt(String.valueOf(Math.round(examScoreExcel.getLearnGrade()*0.5))));
+ if (user.getAge() > 50) {
+ if (null!=examScore.getTheoryGrade()) {
+ examScore.setAllGrade(Integer.parseInt(String.valueOf(Math.round(examScore.getTheoryGrade() * 0.5)))
+ + Integer.parseInt(String.valueOf(Math.round(examScoreExcel.getLearnGrade() * 0.5))));
+ }else {
+ examScore.setAllGrade(Math.round(examScoreExcel.getLearnGrade() / 2));
+ }
}
//内网同步
@@ -311,15 +340,63 @@
"update exam_score set learn_grade = " + "'" + examScore.getLearnGrade() + "'" +
",all_grade = " + "'" + examScore.getAllGrade() + "'" +
",qualified = " + "'" + examScore.getQualified() + "'" +
- " " +"where id = " + "'" + examScore.getId() + "'";
+ " " + "where id = " + "'" + examScore.getId() + "'";
FtpUtil.sqlFileUpload(s1);
//更新成绩数据
baseMapper.updateById(examScore);
+ }else {
+ errorList.add(examScoreExcel.getIdCardNo());
+ status.set(false);
}
}
});
+ //如果所有数据导入有一个异常
+ if (!status.get()){
+ String errorAccount = StringUtils.join(errorList, "\\\n");
+ throw new ServiceException("用户:["+errorAccount+"]实操成绩导入失败!账号与准考证号不匹配!");
+ }
}
}
+
+
+// /**
+// * 导入实操成绩--测试
+// * @param examScoreExcelList
+// * @param isCovered 是否覆盖
+// */
+// @Override
+// public void importExamScore(List<ExamScoreExcel> examScoreExcelList, Boolean isCovered) {
+// if (examScoreExcelList.size()>0){
+// List<Object> errorList = new ArrayList<>();
+// //导入状态，默认为true ,如果有一个出现问题则为 false
+// AtomicBoolean status = new AtomicBoolean(true);
+// //遍历
+// examScoreExcelList.forEach(examScoreExcel -> {
+//// 测试生成考试成绩
+// ExamScore examScore = new ExamScore();
+// examScore.setCandidateNo(examScoreExcel.getCandidateNo());
+// examScore.setQualified(2);
+// //根据身份证号查询用户
+// User user = userService.getUserInfoByIdCardNo(examScoreExcel.getIdCardNo());
+// examScore.setUserId(user.getId().toString());
+// examScore.setExamId("120");
+// //根据准考证号查询报名id
+// TrainingRegistration trainingRegistration = new TrainingRegistration();
+// trainingRegistration.setCandidateNo(examScoreExcel.getCandidateNo());
+// TrainingRegistration one = trainingRegistrationService.getOne(Condition.getQueryWrapper(trainingRegistration));
+// examScore.setApplyId(one.getId());
+// examScore.setLearnGrade(examScoreExcel.getLearnGrade());
+// examScore.setAllGrade(examScore.getLearnGrade()/2);
+// //新增
+// this.save(examScore);
+// });
+// //如果所有数据导入有一个异常
+// if (!status.get()){
+// String errorAccount = StringUtils.join(errorList, "\\\n");
+// throw new ServiceException("用户:["+errorAccount+"]实操成绩导入失败!账号与准考证号不匹配!");
+// }
+// }
+// }
@Override
public List<Map<String, Object>> scoreStatistics(String deptid,String jurisdiction) {
@@ -542,4 +619,68 @@
public List<ExportExamScoreExcel> exportExamScoreList(ExamScoreVO examScoreVO) {
return baseMapper.getExamScoreList(examScoreVO);
}
+
+
+ /**
+ * 考试状态修改,考试成绩恢复
+ * @param
+ * @return
+ */
+ @Override
+ public Boolean refreshTrainExamScore() {
+ int a = 654;
+ List<Integer> list = new ArrayList<>();
+ list.add(a);
+ while (a>=654 && a<=702){
+ a++;
+ list.add(a);
+ }
+ //遍历集合
+ list.forEach(b->{
+ //查询考试记录
+ if (b!=698) {
+ ExamAnswerRecord examAnswerRecord = new ExamAnswerRecord();
+ examAnswerRecord.setScoreId(Long.parseLong(b.toString()));
+ //查询考试成绩
+ ExamScore examScore = this.getById(b);
+ //查询考试记录
+ List<ExamAnswerRecord> examAnswerRecords = examAnswerRecordService.list(Condition.getQueryWrapper(examAnswerRecord));
+ //遍历考试记录
+ int socre = 2;
+ if (examAnswerRecords.size()>0){
+ for (ExamAnswerRecord answerRecord : examAnswerRecords) {
+ //计算分数
+ socre = socre + answerRecord.getAnswerScore();
+ }
+ //修改考试成绩
+ examScore.setTheoryGrade(socre);
+ examScore.setAllGrade(socre/2);
+ String endDate = "2021-10-16 15:30:25";
+ try {
+ examScore.setExamEndTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(endDate));
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ if (socre>=60){
+ examScore.setQualified(2);
+ }else {
+ examScore.setQualified(1);
+ }
+ //更新数据
+ this.updateById(examScore);
+
+ //修改培训考试状态
+ User user = new User();
+ user.setId(Long.parseLong(examScore.getUserId()));
+ user.setIsTrain(3);
+ userService.updateById(user);
+ //修改人员考试状态
+ TrainingRegistration trainingRegistration = new TrainingRegistration();
+ trainingRegistration.setId(examScore.getApplyId());
+ trainingRegistration.setIsExam(2);
+ }
+ }
+ });
+ return false;
+ }
}
--
Gitblit v1.9.3