From 99240e80f8cc18c1944bc9f5c7e48c47c751cd45 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 28 Aug 2021 14:46:25 +0800
Subject: [PATCH] 培训报名考试申请后导入报名数据修改,保安公司查询接口修改

---
 src/main/java/org/springblade/modules/apply/controller/ApplyController.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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("操作成功");
 	}

--
Gitblit v1.9.3