From 65df638262767763375933e8395d5e2253da1798 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 29 Apr 2022 17:33:56 +0800
Subject: [PATCH] 保安员证生成同步修改，外网编号，身份证号码脱敏处理
---
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 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 74173bb..3b89fed 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,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
+import org.springblade.common.utils.DesensitizedUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.modules.FTP.FtpUtil;
@@ -187,7 +188,7 @@
myAsyncService.FTP(s);
}
- //模拟考试
+ //培训考试
if (paper.getExamType() == 2) {
TrainingRegistration trainingRegistration = new TrainingRegistration();
trainingRegistration.setCandidateNo(examScore.getCandidateNo());
@@ -210,7 +211,8 @@
//FtpUtil.sqlFileUpload(s);
myAsyncService.FTP(s);
}
-
+ //设置提交时间
+ examScore.setExamEndTime(new Date());
//设置考试ID
examScore.setExamId(examScore.getPapersId().toString());
//设置理论得分
@@ -313,7 +315,8 @@
count++;
result = pre + (decimalFormat.format(count));
}
- user.setSecuritynumber(result);
+ //脱敏处理
+ user.setSecuritynumber(DesensitizedUtil.desensitizedSecurityNumber(result));
//修改为持证保安
user.setHold("1");
user.setUpdateTime(new Date());
@@ -330,32 +333,32 @@
securityPaper.setExamId(Long.parseLong(examScore.getExamId()));
securityPaper.setApplyId(examScore.getApplyId());
securityPaper.setSource(1);
+ //内网对象
+ SecurityPaper paper = securityPaper;
//新增保安员证信息
+ securityPaper.setNumber(DesensitizedUtil.desensitizedSecurityNumber(result));
+ securityPaper.setIdCardNo("");
securityPaperService.save(securityPaper);
+ //设置id
+ paper.setId(securityPaper.getId());
+ //内网同步
String s1 =
+ "insert into sys_security_paper(id,number,create_time,people_name,id_card_no,user_id,apply_id,exam_id,source) " +
+ "values(" + "'" + paper.getId() + "'"
+ + "," + "'" + paper.getNumber() +"'"
+ + "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(paper.getCreateTime()) +"'"
+ + "," + "'" + paper.getPeopleName() + "'"
+ + "," + "'" + paper.getIdCardNo() + "'"
+ + "," + "'" + paper.getUserId() + "'"
+ + "," + "'" + paper.getApplyId() + "'"
+ + "," + "'" + paper.getExamId() + "'"
+ + "," +"'" + paper.getSource() + "'" + ");" +
"update blade_user set hold = " + "'" + user.getHold() + "'" +
- ",securitynumber = " + "'" + user.getSecuritynumber() + "'" +
+ ",securitynumber = " + "'" + result + "'" +
",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
",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.FTP(s1);
}
}
@@ -391,7 +394,7 @@
//更新成绩数据
baseMapper.updateById(examScore);
} else {
- errorList.add(examScoreExcel.getIdCardNo());
+ errorList.add(examScoreExcel.getName());
status.set(false);
}
});
--
Gitblit v1.9.3