From 07794736f879adb9cf02a69e5c6ada6a94b7bbde Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 06 Nov 2023 14:10:58 +0800
Subject: [PATCH] 考试报名查询修改，分新报名和考试未通过
---
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 53 +++++++++++++----------------------------------------
1 files changed, 13 insertions(+), 40 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 6ae2101..18f2be5 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
@@ -290,11 +290,16 @@
// ExamScore examScore = this.getOne(Condition.getQueryWrapper(examScore1));
if (null != examScore) {
//查询当前保安信息
- UserVO user = userService.getUserAgeById(Long.parseLong(examScore.getUserId()));
+ UserVO user = userService.getUserAgeById(examScore.getUserId());
//设置实操成绩
- examScore.setLearnGrade(examScoreExcel.getLearnGrade());
+ if (examScoreExcel.getLearnGrade().equals("合格")) {
+ examScore.setLearnGrade(0);
+ }
+ if (examScoreExcel.getLearnGrade().equals("不合格")) {
+ examScore.setLearnGrade(1);
+ }
if (null != examScore.getTheoryGrade()) {
- if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() >= 60) {
+ if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() == 0) {
//合格
examScore.setQualified(0);
//修改制证状态为未制证
@@ -307,10 +312,10 @@
int count = userService.getSecurityPaperCount(pre);
String result = null;
if (count == 0) {
- result = pre + "00001";
+ result = pre + "000001";
} else {
//格式化
- DecimalFormat decimalFormat = new DecimalFormat("00000");
+ DecimalFormat decimalFormat = new DecimalFormat("000000");
count++;
result = pre + (decimalFormat.format(count));
}
@@ -341,44 +346,12 @@
",user_type = " + "'" + user.getUserType() + "'" +
" " + "where id = " + "'" + user.getId() + "'";
-// String s1 =
-// "insert into sys_security_paper(id,number,create_time,people_name,id_card_no,user_id,apply_id,exam_id) " +
-// "values(" + "'" + securityPaper.getId() + "'"
-// + "," + "'" + securityPaper.getNumber() +"'"
-// + "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(securityPaper.getCreateTime()) +"'"
-// + "," + "'" + securityPaper.getPeopleName() + "'"
-// + "," + "'" + securityPaper.getIdCardNo() + "'"
-// + "," + "'" + securityPaper.getUserId() + "'"
-// + "," + "'" + securityPaper.getApplyId() + "'"
-// + "," +"'" + securityPaper.getExamId() + "'" + ");" +
-// "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);
myAsyncService.dataSync(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));
- }
}
//内网同步
@@ -642,7 +615,7 @@
//2.修改用户考试状态
User user = new User();
user.setIsTrain(1);
- user.setId(Long.parseLong(examScore.getUserId()));
+ user.setId(examScore.getUserId());
//修改
userService.updateById(user);
@@ -673,7 +646,7 @@
//2.修改用户考试状态
User user = new User();
user.setIsTrain(1);
- user.setId(Long.parseLong(examScore.getUserId()));
+ user.setId(examScore.getUserId());
//修改
userService.updateById(user);
@@ -760,7 +733,7 @@
//修改培训考试状态
User user = new User();
- user.setId(Long.parseLong(examScore.getUserId()));
+ user.setId(examScore.getUserId());
user.setIsTrain(3);
userService.updateById(user);
//修改人员考试状态
--
Gitblit v1.9.3