From 4d9dc12feb33c0470b9a07b7f20159c0a9e9efc4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 27 Aug 2021 22:47:33 +0800
Subject: [PATCH] 考试生成后，导入报名
---
src/main/java/org/springblade/modules/apply/service/ApplyService.java | 2 +-
src/main/java/org/springblade/modules/apply/excel/ApplyImporter.java | 3 ++-
src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java | 35 ++++++++++++++++++++++++++++-------
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 13 ++++++++++++-
4 files changed, 43 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
index cd0c513..1e93222 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -175,7 +175,18 @@
@PostMapping("import-apply")
@ApiOperation(value = "导入报名考试数据", notes = "传入excel")
public R importUser(MultipartFile file, Integer isCovered) {
- ApplyImporter applyImporter = new ApplyImporter(applyService, false);
+ ApplyImporter applyImporter = new ApplyImporter(applyService, false,null);
+ ExcelUtil.save(file, applyImporter, ApplyExcel.class);
+ return R.success("操作成功");
+ }
+
+ /**
+ * 导入报名考试数据(已生成考试)
+ */
+ @PostMapping("import-applys")
+ @ApiOperation(value = "导入报名考试数据", notes = "传入excel")
+ public R importUser(MultipartFile file, Integer isCovered,Long examId) {
+ ApplyImporter applyImporter = new ApplyImporter(applyService, false,examId);
ExcelUtil.save(file, applyImporter, ApplyExcel.class);
return R.success("操作成功");
}
diff --git a/src/main/java/org/springblade/modules/apply/excel/ApplyImporter.java b/src/main/java/org/springblade/modules/apply/excel/ApplyImporter.java
index 60a72aa..99828c4 100644
--- a/src/main/java/org/springblade/modules/apply/excel/ApplyImporter.java
+++ b/src/main/java/org/springblade/modules/apply/excel/ApplyImporter.java
@@ -33,9 +33,10 @@
private final ApplyService service;
private final Boolean isCovered;
+ private final Long examId;
@Override
public void save(List<ApplyExcel> data) {
- service.importApply(data, isCovered);
+ service.importApply(data, isCovered,examId);
}
}
diff --git a/src/main/java/org/springblade/modules/apply/service/ApplyService.java b/src/main/java/org/springblade/modules/apply/service/ApplyService.java
index 4ecf6bb..a85d818 100644
--- a/src/main/java/org/springblade/modules/apply/service/ApplyService.java
+++ b/src/main/java/org/springblade/modules/apply/service/ApplyService.java
@@ -55,7 +55,7 @@
* @param isCovered
* @return
*/
- void importApply(List<ApplyExcel> data, Boolean isCovered);
+ void importApply(List<ApplyExcel> data, Boolean isCovered,Long examId);
/**
* 获取准考证信息
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 6c8b036..9378c2c 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
@@ -105,7 +105,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();
@@ -120,6 +120,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);
@@ -127,9 +133,14 @@
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() + "'";
FtpUtil.sqlFileUpload(s);
}else {
@@ -140,6 +151,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);
@@ -148,9 +164,14 @@
//内网数据同步
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() + "'";
FtpUtil.sqlFileUpload(s);
}
--
Gitblit v1.9.3