From 7327c2b113573bccaeef5b3fc5c82011abc00cd8 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 28 Aug 2021 15:58:03 +0800
Subject: [PATCH] 设备，车辆接口修改
---
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 c6d0d84..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("操作成功");
}
@@ -634,7 +645,7 @@
applyService.updateById(apply);
String s1 =
- "update sys_apply set exam_id = " + apply.getExamId() + "candidate_no = " + "'" + apply.getCandidateNo() + "'" +
+ "update sys_apply set exam_id = " + apply.getExamId() + ",candidate_no = " + "'" + apply.getCandidateNo() + "'" +
" " +"where id = " + "'" + apply.getId() + "'";
FtpUtil.sqlFileUpload(s1);
});
@@ -666,7 +677,6 @@
"values(" + "'" + sid + "'" + "," + "'" + examPaper.getExamName() + "'" + "," + "'" + examPaper.getExamType() +
"'" + "," +"'" + format + "'" + ")";
FtpUtil.sqlFileUpload(s);
-
//修改报名信息
applyIds.forEach(id ->{
@@ -751,6 +761,7 @@
String s3 = "select * from ksxt_exam";
FtpUtil.sqlFileUpload(s1);
FtpUtil.sqlFileUpload(s2);
+// FtpUtil.sqlFileUpload(s3);
String json1 = JSON.toJSONString(s3);
String response1 = String.valueOf((new Date()).getTime());
OutJson.createJsonFile(json1, localPath, "f"+response1);
--
Gitblit v1.9.3