From e262c9dd1b5f00b5f0ee4ea85a51a6e769c39590 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 09 Aug 2021 15:31:18 +0800
Subject: [PATCH] 1.现场检查
---
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 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 884a83f..40e86e8 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -94,6 +94,11 @@
@PostMapping("/submit")
public R submit(@RequestBody Apply apply) throws Exception {
if (null==apply.getId()){
+ //查询人员是否已报名
+ Integer isApply = applyService.getIsApply(apply);
+ if (null!=isApply){
+ return R.data(201,"已报名，不能重复报名");
+ }
//去生成准考证号码
apply.setCandidateNo(getCandidateNo(apply));
//去生成考试编号
@@ -103,15 +108,19 @@
//默认为未考试状态
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));
+ boolean status = applyService.saveOrUpdate(apply);
+// if (status){
+// //内网新增
+//// arg.test01(arg.url+"/apply/save",apply);
+// return R.data(200,"报名成功");
+// }
+// //内网修改
+// if(null!=apply.getId()){
+// //修改
+// arg.test01(arg.url+"/apply/update",apply);
+// }
+ return R.data(202,"报名失败");
}
@@ -121,8 +130,8 @@
@PostMapping("import-apply")
@ApiOperation(value = "导入报名考试数据", notes = "传入excel")
public R importUser(MultipartFile file, Integer isCovered) {
- ApplyImporter applyImporter = new ApplyImporter(applyService, isCovered == 1);
- ExcelUtil.save(file, applyImporter, ApplyExcel.class);
+ ApplyImporter applyImporter = new ApplyImporter(applyService, false);
+ ExcelUtil.save(file, applyImporter, ApplyInfoExcel.class);
return R.success("操作成功");
}
@@ -132,8 +141,8 @@
@GetMapping("export-template")
@ApiOperation(value = "导出模板")
public void exportUser(HttpServletResponse response) {
- List<ApplyExcel> list = new ArrayList<>();
- ExcelUtil.export(response, "考试报名数据模板", "考试报名数据表", list, ApplyExcel.class);
+ List<ApplyInfoExcel> list = new ArrayList<>();
+ ExcelUtil.export(response, "考试报名数据模板", "考试报名数据表", list, ApplyInfoExcel.class);
}
@@ -289,7 +298,7 @@
*/
@PostMapping("/remove")
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
- arg.sendPostRemoveByIds(arg.url+"/apply/remove",ids);
+ //arg.sendPostRemoveByIds(arg.url+"/apply/remove",ids);
return R.status(applyService.removeByIds(Func.toLongList(ids)));
}
--
Gitblit v1.9.3