From 116143f2237156ff892d6951d6943285fa304f0e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 08 Dec 2021 17:33:23 +0800
Subject: [PATCH] 考试成绩查询，导出修改，实操成绩导入去除准考证号，保安员导入新增身份证住址校验
---
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 241 +++++++++++++++++++++++++++--------------------
1 files changed, 137 insertions(+), 104 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 77273b8..c918736 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
@@ -3,9 +3,7 @@
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;
@@ -23,7 +21,6 @@
import org.springblade.modules.exam.vo.ExamResultVO;
import org.springblade.modules.exam.vo.ExamScoreVO;
import org.springblade.modules.exam.vo.UpdateParamVo;
-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;
@@ -39,8 +36,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
-
-import static com.bstek.ureport.expression.model.condition.Join.and;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* 考试成绩服务实现类
@@ -170,7 +166,6 @@
apply1.setIsExam(2);
applyService.updateById(apply1);
-
//数据同步
String s =
"update sys_apply set is_exam = " + apply1.getIsExam() + " " +"where id = " + "'" + apply1.getId() + "';" +
@@ -254,99 +249,108 @@
examScoreExcelList.forEach(examScoreExcel -> {
if (null!=examScoreExcel.getLearnGrade() && null!=examScoreExcel.getIdCardNo() && examScoreExcel.getIdCardNo()!=""){
//使用考试名称匹配考试信息
-// ExamPaper examPaper = examPaperService.getExamInfoByExamName(examScoreExcel.getExamName());
+ List<ExamPaper> examPaperList = examPaperService.getExamInfoByExamName(examScoreExcel.getExamName());
+ ExamPaper examPaper = examPaperList.get(0);
//查询出成绩数据
-// 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()));
- examScore.setLearnGrade(examScoreExcel.getLearnGrade());
- if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() >= 60) {
- //合格
- examScore.setQualified(0);
- //修改制证状态为未制证
- user.setUserType(7);
- //正式考试通过生成保安证编号
+ if (examPaperList.size()>0){
+ //取第一个
+ List<ExamScore> examScoreList = baseMapper.getExamScoreInfoByIdCardNo(examScoreExcel.getIdCardNo(),new SimpleDateFormat("yyyy-MM-dd").format(examPaper.getStartTime()));
+ if (examScoreList.size()==0){
+ //根据身份证号查询用户
+ User user0 = userService.getUserInfoByIdCardNo(examScoreExcel.getIdCardNo());
+ if (null==user0){
+ throw new ServiceException("没有找到用户:["+examScoreExcel.getIdCardNo()+"]相关考试成绩信息,请检查身份证是否有误!");
+// throw new ServiceException("用户:["+examScoreExcel.getIdCardNo()+"]不存在");
+ }
+ }
+ //遍历集合
+ examScoreList.forEach(examScore -> {
+// 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()));
+ examScore.setLearnGrade(examScoreExcel.getLearnGrade());
+ if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() >= 60) {
+ //合格
+ examScore.setQualified(0);
+ //修改制证状态为未制证
+ user.setUserType(7);
+ //正式考试通过生成保安证编号
// if (examPaper.getExamType()==1) {
- //如果已有保安证编号，不更新用户信息
- if (null==user.getSecuritynumber() || user.getSecuritynumber().equals("")) {
- //去生成保安证编号
- String pre = SecurityPaperUtil.getSecurityPaper();
- //查询当前年份已有的保安证编号
- int count = userService.getSecurityPaperCount(pre);
- String result = null;
- if (count == 0) {
- result = pre + "00001";
- } else {
- //格式化
- DecimalFormat decimalFormat = new DecimalFormat("00000");
- count++;
- result = pre + (decimalFormat.format(count));
- }
- user.setSecuritynumber(result);
- //发证日期
+ //如果已有保安证编号，不更新用户信息
+ if (null==user.getSecuritynumber() || user.getSecuritynumber().equals("")) {
+ //去生成保安证编号
+ String pre = SecurityPaperUtil.getSecurityPaper();
+ //查询当前年份已有的保安证编号
+ int count = userService.getSecurityPaperCount(pre);
+ String result = null;
+ if (count == 0) {
+ result = pre + "00001";
+ } else {
+ //格式化
+ DecimalFormat decimalFormat = new DecimalFormat("00000");
+ count++;
+ result = pre + (decimalFormat.format(count));
+ }
+ user.setSecuritynumber(result);
+ //发证日期
// user.setPaperTime(new Date());
- //修改为持证保安
- user.setHold("1");
- //更新保安数据
- userService.updateById(user);
+ //修改为持证保安
+ user.setHold("1");
+ user.setUpdateTime(new Date());
+ //更新保安数据
+ userService.updateById(user);
+ String s1 =
+ "update blade_user set hold = " + "'" + user.getHold() + "'" +
+ ",securitynumber = " + "'" + user.getSecuritynumber() + "'" +
+ ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
+ ",user_type = " + "'" + user.getUserType() + "'" +
+ " " + "where id = " + "'" + user.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ }
+ } else {
+ //不合格
+ examScore.setQualified(1);
+ }
+ //总成绩
+ 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) {
+ 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));
+ }
+ }
+
+ //内网同步
String s1 =
- "update blade_user set hold = " + "'" + user.getHold() + "'" +
- ",securitynumber = " + "'" + user.getSecuritynumber() + "'" +
- ",user_type = " + "'" + user.getUserType() + "'" +
- " " + "where id = " + "'" + user.getId() + "'";
+ "update exam_score set learn_grade = " + "'" + examScore.getLearnGrade() + "'" +
+ ",all_grade = " + "'" + examScore.getAllGrade() + "'" +
+ ",qualified = " + "'" + examScore.getQualified() + "'" +
+ " " + "where id = " + "'" + examScore.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) {
- if (null!=examScore.getTheoryGrade()) {
- examScore.setAllGrade(Math.round((examScore.getTheoryGrade() + examScoreExcel.getLearnGrade()) / 2));
+ //更新成绩数据
+ baseMapper.updateById(examScore);
}else {
- examScore.setAllGrade(Math.round(examScoreExcel.getLearnGrade() / 2));
+ errorList.add(examScoreExcel.getIdCardNo());
+ status.set(false);
}
- }
- 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));
- }
- }
+ });
- //内网同步
- String s1 =
- "update exam_score set learn_grade = " + "'" + examScore.getLearnGrade() + "'" +
- ",all_grade = " + "'" + examScore.getAllGrade() + "'" +
- ",qualified = " + "'" + examScore.getQualified() + "'" +
- " " + "where id = " + "'" + examScore.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
- //更新成绩数据
- baseMapper.updateById(examScore);
}else {
- errorList.add(examScoreExcel.getIdCardNo());
- status.set(false);
+ throw new ServiceException("导入失败!考试名称:["+examScoreExcel.getExamName()+"]不存在!请核对!");
}
}
});
@@ -370,31 +374,60 @@
// List<Object> errorList = new ArrayList<>();
// //导入状态，默认为true ,如果有一个出现问题则为 false
// AtomicBoolean status = new AtomicBoolean(true);
+// AtomicInteger num = new AtomicInteger();
// //遍历
// 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);
+//// TrainingRegistration registration = new TrainingRegistration();
+//// registration.setCandidateNo(examScoreExcel.getCandidateNo());
+//// TrainingRegistration one1 = trainingRegistrationService.getOne(Condition.getQueryWrapper(registration));
+//// 测试生成考试成绩
+// ExamScore examScore1 = new ExamScore();
+// examScore1.setCandidateNo(examScoreExcel.getCandidateNo());
+// examScore1.setUserId(user.getId().toString());
+// //根据准考证号和用户id查询考试成绩
+// ExamScore examScore = this.getOne(Condition.getQueryWrapper(examScore1));
+// examScore.setQualified(0);
+// //根据身份证号查询用户
+// examScore.setTheoryGrade(examScoreExcel.getTheoryGrade());
+// examScore.setAllGrade((examScore.getLearnGrade()+examScore.getTheoryGrade())/2);
+//
// //新增
-// this.save(examScore);
+// this.updateById(examScore);
+//
+// //生成准考证号
+// if (null==user.getSecuritynumber() || user.getSecuritynumber().equals("") ) {
+// //去生成保安证编号
+// String pre = SecurityPaperUtil.getSecurityPaper();
+// //查询当前年份已有的保安证编号
+// int count = userService.getSecurityPaperCount(pre);
+// String result = null;
+// if (count == 0) {
+// result = pre + "00001";
+// } else {
+// //格式化
+// DecimalFormat decimalFormat = new DecimalFormat("00000");
+// count++;
+// result = pre + (decimalFormat.format(count));
+// }
+// user.setSecuritynumber(result);
+// //修改为持证保安
+// user.setHold("1");
+//// user.setRegistered(examScoreExcel.getExamName());
+// //更新保安数据
+// userService.updateById(user);
+// num.getAndIncrement();
+// }
// });
// //如果所有数据导入有一个异常
// if (!status.get()){
// String errorAccount = StringUtils.join(errorList, "\\\n");
// throw new ServiceException("用户:["+errorAccount+"]实操成绩导入失败!账号与准考证号不匹配!");
// }
+// if (status.get()){
+// throw new ServiceException("更新成功："+ num.get());
+// }
// }
// }
--
Gitblit v1.9.3