From 138cac5008689fadaa96ecac116a2297bb69bc1c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 04 Mar 2022 10:45:40 +0800
Subject: [PATCH] 1. 电子围栏基本接口新增 2. 保安员证核查申请记录基本接口新增，审批，批量审批接口编写 3. 保安员证档案库新增字段 source 来源，保安员证生成修改
---
src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java b/src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java
index f3b18a9..1184f99 100644
--- a/src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java
@@ -18,6 +18,7 @@
import org.springblade.modules.securitypaper.service.SecurityPaperService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.training.entity.TrainingRegistration;
import org.springblade.modules.training.service.TrainingRegistrationService;
@@ -53,6 +54,8 @@
@Autowired
private SecurityPaperService securityPaperService;
+ @Autowired
+ private MyAsyncService myAsyncService;
/**
* 自定义分页
@@ -146,7 +149,8 @@
" " + "where id = " + "'" + trainingRegistration.getId() + "';"+
"update blade_user set is_train = " + "'" + user.getIsTrain() + "'" +
" " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
} else {
//实操成绩不为空
if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() >= 60) {
@@ -184,6 +188,7 @@
securityPaper.setPeopleName(user.getRealName());
securityPaper.setExamId(Long.parseLong(examScore.getExamId()));
securityPaper.setApplyId(examScore.getApplyId());
+ securityPaper.setSource(1);
//新增保安员证信息
securityPaperService.save(securityPaper);
@@ -198,7 +203,8 @@
+ "," + "'" + securityPaper.getUserId() + "'"
+ "," + "'" + securityPaper.getApplyId() + "'"
+ "," +"'" + securityPaper.getExamId() + "'" + ")";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}
} else {
//不合格
@@ -238,7 +244,8 @@
",user_type = " + "'" + user.getUserType() + "'" +
",is_train = " + "'" + user.getIsTrain() + "'" +
" " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}
}
//审核时间
@@ -312,7 +319,8 @@
" " + "where id = " + "'" + trainingRegistration.getId() + "';"+
"update blade_user set is_train = " + "'" + user.getIsTrain() + "'" +
" " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
} else {
//实操成绩不为空
if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() >= 60) {
@@ -342,6 +350,19 @@
user.setHold("1");
//更新保安数据
userService.updateById(user);
+
+ //生成保安证的同时向保安证管理表中插入一条数据
+ SecurityPaper securityPaper = new SecurityPaper();
+ securityPaper.setUserId(user.getId());
+ securityPaper.setNumber(result);
+ securityPaper.setCreateTime(new Date());
+ securityPaper.setIdCardNo(user.getCardid());
+ securityPaper.setPeopleName(user.getRealName());
+ securityPaper.setExamId(Long.parseLong(examScore.getExamId()));
+ securityPaper.setApplyId(examScore.getApplyId());
+ securityPaper.setSource(1);
+ //新增保安员证信息
+ securityPaperService.save(securityPaper);
// String s1 =
// "update blade_user set hold = " + "'" + user.getHold() + "'" +
@@ -387,7 +408,8 @@
",user_type = " + "'" + user.getUserType() + "'" +
",is_train = " + "'" + user.getIsTrain() + "'" +
" " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}
}
//审核时间
--
Gitblit v1.9.3