From 8782a61b92d8dc1f8d3fd7d16a517fa934ac7e96 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 15 Nov 2021 20:59:33 +0800
Subject: [PATCH] 枪支,车辆批量导入,制证申请修改,审核通过状态修改为未制证
---
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 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..ec73a36 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
@@ -372,23 +372,48 @@
// AtomicBoolean status = new AtomicBoolean(true);
// //遍历
// 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));
//// 测试生成考试成绩
// ExamScore examScore = new ExamScore();
-// examScore.setCandidateNo(examScoreExcel.getCandidateNo());
-// examScore.setQualified(2);
+// examScore.setCandidateNo(one1.getCandidateNo());
+// examScore.setQualified(0);
// //根据身份证号查询用户
-// 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.setUserId(userInfoByIdCardNo.getId().toString());
+// examScore.setExamId(one1.getTrainExamId());
+// examScore.setApplyId(one1.getId());
// examScore.setLearnGrade(examScoreExcel.getLearnGrade());
-// examScore.setAllGrade(examScore.getLearnGrade()/2);
+// examScore.setTheoryGrade(examScoreExcel.getTheoryGrade());
+// examScore.setAllGrade((examScore.getLearnGrade()+examScore.getTheoryGrade())/2);
+//
// //新增
// this.save(examScore);
+//
+// //生成准考证号
+// if (null==userInfoByIdCardNo.getSecuritynumber() || userInfoByIdCardNo.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));
+// }
+// userInfoByIdCardNo.setSecuritynumber(result);
+// //修改为持证保安
+// userInfoByIdCardNo.setHold("1");
+// userInfoByIdCardNo.setRegistered(examScoreExcel.getExamName());
+// //更新保安数据
+// userService.updateById(userInfoByIdCardNo);
+// }
// });
// //如果所有数据导入有一个异常
// if (!status.get()){
--
Gitblit v1.9.3