From 7293f04d18fb2e882e152f962c3aa1d8fcb1f93e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 17 Nov 2021 15:46:35 +0800
Subject: [PATCH] 证书打印信息导出修改
---
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 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 ec73a36..8c750f6 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;
/**
* 考试成绩服务实现类
@@ -370,30 +366,30 @@
// List<Object> errorList = new ArrayList<>();
// //导入状态，默认为true ,如果有一个出现问题则为 false
// AtomicBoolean status = new AtomicBoolean(true);
+// AtomicInteger num = new AtomicInteger();
// //遍历
// examScoreExcelList.forEach(examScoreExcel -> {
// //根据身份证号查询培训信息
-// User userInfoByIdCardNo = userService.getUserInfoByIdCardNo(examScoreExcel.getIdCardNo());
-// TrainingRegistration registration = new TrainingRegistration();
-// registration.setUserId(userInfoByIdCardNo.getId().toString());
-// TrainingRegistration one1 = trainingRegistrationService.getOne(Condition.getQueryWrapper(registration));
+// User user = userService.getUserInfoByIdCardNo(examScoreExcel.getIdCardNo());
+//// TrainingRegistration registration = new TrainingRegistration();
+//// registration.setCandidateNo(examScoreExcel.getCandidateNo());
+//// TrainingRegistration one1 = trainingRegistrationService.getOne(Condition.getQueryWrapper(registration));
//// 测试生成考试成绩
-// ExamScore examScore = new ExamScore();
-// examScore.setCandidateNo(one1.getCandidateNo());
+// 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.setUserId(userInfoByIdCardNo.getId().toString());
-// examScore.setExamId(one1.getTrainExamId());
-// examScore.setApplyId(one1.getId());
-// examScore.setLearnGrade(examScoreExcel.getLearnGrade());
// examScore.setTheoryGrade(examScoreExcel.getTheoryGrade());
// examScore.setAllGrade((examScore.getLearnGrade()+examScore.getTheoryGrade())/2);
//
// //新增
-// this.save(examScore);
+// this.updateById(examScore);
//
// //生成准考证号
-// if (null==userInfoByIdCardNo.getSecuritynumber() || userInfoByIdCardNo.getSecuritynumber().equals("") ) {
+// if (null==user.getSecuritynumber() || user.getSecuritynumber().equals("") ) {
// //去生成保安证编号
// String pre = SecurityPaperUtil.getSecurityPaper();
// //查询当前年份已有的保安证编号
@@ -407,12 +403,13 @@
// count++;
// result = pre + (decimalFormat.format(count));
// }
-// userInfoByIdCardNo.setSecuritynumber(result);
+// user.setSecuritynumber(result);
// //修改为持证保安
-// userInfoByIdCardNo.setHold("1");
-// userInfoByIdCardNo.setRegistered(examScoreExcel.getExamName());
+// user.setHold("1");
+//// user.setRegistered(examScoreExcel.getExamName());
// //更新保安数据
-// userService.updateById(userInfoByIdCardNo);
+// userService.updateById(user);
+// num.getAndIncrement();
// }
// });
// //如果所有数据导入有一个异常
@@ -420,6 +417,9 @@
// String errorAccount = StringUtils.join(errorList, "\\\n");
// throw new ServiceException("用户:["+errorAccount+"]实操成绩导入失败!账号与准考证号不匹配!");
// }
+// if (status.get()){
+// throw new ServiceException("更新成功："+ num.get());
+// }
// }
// }
--
Gitblit v1.9.3