From c8ebf3038d2a7f69d9eb40f5a276dc3fa826fa9b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 10 Aug 2021 21:42:52 +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 d5b4bf2..bf57b07 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -166,7 +166,7 @@
 	@ApiOperation(value = "导入报名考试数据", notes = "传入excel")
 	public R importUser(MultipartFile file, Integer isCovered) {
 		ApplyImporter applyImporter = new ApplyImporter(applyService, false);
-		ExcelUtil.save(file, applyImporter, ApplyInfoExcel.class);
+		ExcelUtil.save(file, applyImporter, ApplyExcel.class);
 		return R.success("操作成功");
 	}
 
@@ -176,8 +176,8 @@
 	@GetMapping("export-template")
 	@ApiOperation(value = "导出模板")
 	public void exportUser(HttpServletResponse response) {
-		List<ApplyInfoExcel> list = new ArrayList<>();
-		ExcelUtil.export(response, "考试报名数据模板", "考试报名数据表", list, ApplyInfoExcel.class);
+		List<ApplyExcel> list = new ArrayList<>();
+		ExcelUtil.export(response, "考试报名数据模板", "考试报名数据表", list, ApplyExcel.class);
 	}
 
 
@@ -527,4 +527,15 @@
 		return null;
 	}
 
+
+	/**
+	 * 查询报名清册信息
+	 * @param apply 报名信息
+	 * @return
+	 */
+	@GetMapping("/getApplyDetailList")
+	public Map<String,Object> getApplyDetailList(ApplyVO apply){
+		return applyService.getApplyDetailList(apply);
+	}
+
 }

--
Gitblit v1.9.3