From c9f44e0ef916dd8d84639fe86d001a440ca76474 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 02 Aug 2021 20:13:38 +0800
Subject: [PATCH] 1.新增保安个人照片，准考证信息接口修改 2.新增导出清册接口
---
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 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 213af5b..884a83f 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -14,11 +14,14 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.apply.entity.Apply;
import org.springblade.modules.apply.excel.ApplyExcel;
import org.springblade.modules.apply.excel.ApplyImporter;
+import org.springblade.modules.apply.excel.ApplyInfoExcel;
import org.springblade.modules.apply.service.ApplyService;
+import org.springblade.modules.apply.vo.ApplyPaPerVO;
import org.springblade.modules.apply.vo.ApplyVO;
import org.springblade.modules.exam.entity.ExamPaper;
import org.springblade.modules.exam.service.ExamPaperService;
@@ -89,7 +92,7 @@
* @param apply 考试报名信息对象
*/
@PostMapping("/submit")
- public R submit(@RequestBody Apply apply) {
+ public R submit(@RequestBody Apply apply) throws Exception {
if (null==apply.getId()){
//去生成准考证号码
apply.setCandidateNo(getCandidateNo(apply));
@@ -97,7 +100,16 @@
apply.setApplyCode(getApplyCode(apply));
//默认通过
apply.setApplyStatus(2);
+ //默认为未考试状态
+ apply.setIsExam(1);
apply.setApplyTime(new Date());
+ //内网新增
+ arg.test01(arg.url+"/apply/save",apply);
+ }
+ //内网修改
+ if(null!=apply.getId()){
+ //修改
+ arg.test01(arg.url+"/apply/update",apply);
}
return R.status(applyService.saveOrUpdate(apply));
}
@@ -122,6 +134,19 @@
public void exportUser(HttpServletResponse response) {
List<ApplyExcel> list = new ArrayList<>();
ExcelUtil.export(response, "考试报名数据模板", "考试报名数据表", list, ApplyExcel.class);
+ }
+
+
+ /**
+ * 导出报名数数据
+ * @param response
+ * @param apply 报名对象
+ */
+ @GetMapping("export-apply")
+ @ApiOperation(value = "导出报名清册")
+ public void exportApply(HttpServletResponse response,Apply apply) {
+ List<ApplyInfoExcel> list = applyService.getApplyExcelList(apply);
+ ExcelUtil.export(response, "考试报名清册数据"+ DateUtil.time(), "考试报名清册数据表", list, ApplyInfoExcel.class);
}
/**
@@ -182,7 +207,7 @@
/**
- * 生成准考证号码
+ * 生成报名编号
* @param apply 考试报名信息对象
*/
private String getApplyCode(Apply apply) {
@@ -281,4 +306,20 @@
return R.data(detail);
}
+ /**
+ * 获取准考证信息
+ * @param apply
+ * @return
+ */
+ @GetMapping("/getApplyInfo")
+ public R<ApplyPaPerVO> getApplyInfo(Apply apply,HttpServletResponse response) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+ //查询考试报名详情
+ ApplyPaPerVO detail = applyService.getApplyInfo(apply);
+ //返回
+ return R.data(detail);
+ }
+
}
--
Gitblit v1.9.3