From 345d17cf82e1bbc1fbfbeec10193c2bed59cd674 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 22:21:21 +0800
Subject: [PATCH] 注册登录，车辆，装备，枪支，招聘，培训考试修改
---
src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java | 72 +++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 30 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java b/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
index cbc1d89..c8fc2f5 100644
--- a/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
@@ -40,9 +40,6 @@
import java.text.SimpleDateFormat;
import java.util.*;
-import static org.springblade.common.constant.FtpConstant.*;
-import static org.springblade.common.constant.FtpConstant.fileName;
-
/**
* 考试报名服务实现类
* @author zhongrj
@@ -106,7 +103,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void importApply(List<ApplyExcel> data, Boolean isCovered) {
+ public void importApply(List<ApplyExcel> data, Boolean isCovered,Long examId) {
data.forEach(applyExcel -> {
//查询用户信息
User user = new User();
@@ -121,6 +118,12 @@
apply1.setIsExam(1);
apply1.setApplyTime(new Date());
apply1.setUserId(user1.getId());
+ if (null!=examId){
+ apply1.setExamId(examId);
+ //生成准考证号
+ apply1.setCandidateNo(getCandidateNo(apply1));
+ }
+
this.save(apply1);
//修改保安报名状态
user1.setIsApply(1);
@@ -128,19 +131,16 @@
String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
Long id = apply1.getId();
- String s = "insert into sys_apply(id,user_id,apply_time,apply_status,is_exam) " +
- "values(" + "'" + id + "'" + "," + "'" + apply1.getUserId() + "'" + "," + "'" + formatStr +
- "'" + "," + "'" + apply1.getApplyStatus() + "'" + "," +"'" + apply1.getIsExam() + "'" + ");" +
+ String s = "insert into sys_apply(id,user_id,candidate_no,apply_time,apply_status,exam_id,is_exam) " +
+ "values(" + "'" + id + "'" + ","
+ + "'" + apply1.getUserId() + "'" + ","
+ + "'" + apply1.getCandidateNo() + "'" + ","
+ + "'" + formatStr +"'" + ","
+ + "'" + apply1.getApplyStatus() + "'" + ","
+ + "'" + examId + "'" + ","
+ +"'" + apply1.getIsExam() + "'" + ");" +
"update blade_user set is_apply = " + "'" + user1.getIsApply() + "'" +"where id = " + "'" + user1.getId() + "'";
- String json = JSON.toJSONString(s);
- OutJson.createJsonFile(json, "d:/", "wsql");
- FileInputStream in = null;
- try {
- in = new FileInputStream(new File("D:\\" + fileName));
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- }
- FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", "/", fileName, in);
+ FtpUtil.sqlFileUpload(s);
}else {
if (user1.getIsApply()!=1) {
Apply apply1 = new Apply();
@@ -149,6 +149,11 @@
apply1.setIsExam(1);
apply1.setApplyTime(new Date());
apply1.setUserId(user1.getId());
+ if (null!=examId){
+ apply1.setExamId(examId);
+ //生成准考证号
+ apply1.setCandidateNo(getCandidateNo(apply1));
+ }
this.save(apply1);
//修改保安报名状态
user1.setIsApply(1);
@@ -157,19 +162,16 @@
//内网数据同步
String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
Long id = apply1.getId();
- String s = "insert into sys_apply(id,user_id,apply_time,apply_status,is_exam) " +
- "values(" + "'" + id + "'" + "," + "'" + apply1.getUserId() + "'" + "," + "'" + formatStr +
- "'" + "," + "'" + apply1.getApplyStatus() + "'" + "," +"'" + apply1.getIsExam() + "'" + ");" +
+ String s = "insert into sys_apply(id,user_id,candidate_no,apply_time,apply_status,exam_id,is_exam) " +
+ "values(" + "'" + id + "'" + ","
+ + "'" + apply1.getUserId() + "'" + ","
+ + "'" + apply1.getCandidateNo() + "'" + ","
+ + "'" + formatStr +"'" + ","
+ + "'" + apply1.getApplyStatus() + "'" + ","
+ + "'" + examId + "'" + ","
+ +"'" + apply1.getIsExam() + "'" + ");" +
"update blade_user set is_apply = " + "'" + user1.getIsApply() + "'" +"where id = " + "'" + user1.getId() + "'";
- String json = JSON.toJSONString(s);
- OutJson.createJsonFile(json, "d:/", "wsql");
- FileInputStream in = null;
- try {
- in = new FileInputStream(new File("D:\\" + fileName));
- } catch (FileNotFoundException e) {
- e.printStackTrace();
- }
- FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", "/", fileName, in);
+ FtpUtil.sqlFileUpload(s);
}
}
}
@@ -390,8 +392,10 @@
* @return
*/
@Override
- public List<Long> getApplyIds() {
- return baseMapper.getApplyIds();
+ public List<Apply> getApplyIds(ApplyVO applyVO) {
+ applyVO.setSerialStart(applyVO.getSerialStart() -1);
+ applyVO.setSerialEnd(applyVO.getSerialEnd() -applyVO.getSerialStart());
+ return baseMapper.getApplyIds(applyVO);
}
/**
@@ -456,6 +460,10 @@
//考试中
apply1.setIsExam(3);
baseMapper.updateById(apply1);
+
+ String s1 =
+ "update sys_apply set is_exam = " + apply1.getIsExam() + " " +"where id = " + "'" + apply1.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
}
//模拟考
if (apply.getExamType()==2){
@@ -464,6 +472,10 @@
//考试中
trainingRegistration.setIsExam(3);
trainingRegistrationService.updateById(trainingRegistration);
+
+ String s1 =
+ "update sys_training_registration set is_exam = " + trainingRegistration.getIsExam() + " " +"where id = " + "'" + trainingRegistration.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
}
}
--
Gitblit v1.9.3