From 6b110c93a1fb5392401e0674db0dd807ea82a12f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 14 Dec 2021 14:41:40 +0800
Subject: [PATCH] 1. 实操成绩导入修改 2. 定时任务配置多线程执行 3. 保安员查询修改
---
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 73 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 37 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 1a48faa..35d1e7b 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
@@ -273,45 +273,44 @@
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);
- //发证日期
-// user.setPaperTime(new Date());
- //修改为持证保安
- user.setHold("1");
- user.setUpdateTime(new Date());
- //更新保安数据
- userService.updateById(user);
+ if (null!=examScore.getTheoryGrade()){
+ if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() >= 60) {
+ //合格
+ examScore.setQualified(0);
+ //修改制证状态为未制证
+ user.setUserType(7);
+ //如果已有保安证编号，不更新用户信息
+ 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.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);
+ 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 {
//不合格
--
Gitblit v1.9.3