From d5041a59d46d5c84f9606fac4bdd857784ea32c5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 10 Aug 2021 09:31:49 +0800
Subject: [PATCH] 考试报名，取消报名接口修改
---
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 154 insertions(+), 19 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 12aad1c..6e543d4 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -14,15 +14,19 @@
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;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IUserService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -44,6 +48,8 @@
private final ApplyService applyService;
private final ExamPaperService examPaperService;
+
+ private final IUserService userService;
/**
* 自定义分页
@@ -92,24 +98,64 @@
@PostMapping("/submit")
public R submit(@RequestBody Apply apply) throws Exception {
if (null==apply.getId()){
+ //查询人员是否已报名
+ User user = userService.getById(apply.getUserId());
+ if (null==user.getIsApply()){
+ //默认通过
+ apply.setApplyStatus(2);
+ //默认为未考试状态
+ apply.setIsExam(1);
+ apply.setApplyTime(new Date());
+ //修改保安报名状态
+ User user1 = new User();
+ user1.setId(apply.getUserId());
+ user1.setIsApply(1);
+ userService.updateById(user1);
+ return R.data(200,"报名成功");
+ }else {
+ if (1==user.getIsApply()){
+ return R.data(201,"已报名，不能重复报名");
+ }
+ if (2==user.getIsApply()){
+ //默认通过
+ apply.setApplyStatus(2);
+ //默认为未考试状态
+ apply.setIsExam(1);
+ apply.setApplyTime(new Date());
+ //修改保安报名状态
+ User user1 = new User();
+ user1.setId(apply.getUserId());
+ user1.setIsApply(1);
+ userService.updateById(user1);
+ return R.data(200,"报名成功");
+ }
+ }
+
//去生成准考证号码
- apply.setCandidateNo(getCandidateNo(apply));
+// apply.setCandidateNo(getCandidateNo(apply));
//去生成考试编号
- apply.setApplyCode(getApplyCode(apply));
- //默认通过
- apply.setApplyStatus(2);
- //默认为未考试状态
- apply.setIsExam(1);
- apply.setApplyTime(new Date());
+// apply.setApplyCode(getApplyCode(apply));
+
+ }else {
+ //修改保安报名状态
+ User user = new User();
+ user.setId(apply.getUserId());
+ user.setIsApply(2);
+ userService.updateById(user);
+ }
+ apply.setApplyStatus(4);
+ boolean status = applyService.saveOrUpdate(apply);
+ if (status){
//内网新增
- arg.test01(arg.url+"/apply/save",apply);
+// arg.test01(arg.url+"/apply/save",apply);
+ return R.data(200,"取消报名成功");
}
- //内网修改
- if(null!=apply.getId()){
- //修改
- arg.test01(arg.url+"/apply/update",apply);
- }
- return R.status(applyService.saveOrUpdate(apply));
+// //内网修改
+// if(null!=apply.getId()){
+// //修改
+// arg.test01(arg.url+"/apply/update",apply);
+// }
+ return R.data(202,"报名失败");
}
@@ -119,8 +165,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("操作成功");
}
@@ -130,8 +176,21 @@
@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);
+ }
+
+
+ /**
+ * 导出报名数数据
+ * @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);
}
/**
@@ -274,7 +333,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)));
}
@@ -307,4 +366,80 @@
return R.data(detail);
}
+ /**
+ * 取消报名
+ * @param apply 考试报名信息对象
+ */
+ @PostMapping("/cancelApply")
+ public R cancelApply(@RequestBody Apply apply){
+ //查询人员是否已报名
+ User user = userService.getById(apply.getUserId());
+ if(null==user.getIsApply()){
+ apply.setApplyStatus(4);
+ boolean status = applyService.updateById(apply);
+ //修改保安报名状态
+ user.setIsApply(2);
+ userService.updateById(user);
+ if (status){
+ return R.data(200,"取消报名成功");
+ }
+ }else {
+ if (user.getIsApply()==2) {
+ return R.data(201,"尚未报名");
+ }
+ if(user.getIsApply()==1){
+ apply.setApplyStatus(4);
+ boolean status = applyService.updateById(apply);
+ //修改保安报名状态
+ user.setIsApply(2);
+ userService.updateById(user);
+ if (status){
+ return R.data(200,"取消报名成功");
+ }
+ }
+
+ }
+ return R.data(202,"取消报名失败");
+ }
+
+
+ /**
+ * 批量报名
+ * @param apply 考试报名信息对象
+ */
+ @PostMapping("/batchApply")
+ public R batchApply(@RequestBody ApplyVO apply){
+ List<String> list = Arrays.asList(apply.getUserIds().split(","));
+ list.forEach(userId ->{
+ User user = userService.getById(userId);
+ //未报名的新增，已报名的不做处理
+ if (null==user.getIsApply()) {
+ Apply apply1 = new Apply();
+ apply1.setApplyStatus(2);
+ //默认为未考试状态
+ apply1.setIsExam(1);
+ apply1.setApplyTime(new Date());
+ apply1.setUserId(Long.parseLong(userId));
+ applyService.save(apply1);
+ //修改保安报名状态
+ user.setIsApply(1);
+ userService.updateById(user);
+ }else {
+ if (user.getIsApply()==2) {
+ Apply apply1 = new Apply();
+ apply1.setApplyStatus(2);
+ //默认为未考试状态
+ apply1.setIsExam(1);
+ apply1.setApplyTime(new Date());
+ apply1.setUserId(Long.parseLong(userId));
+ applyService.save(apply1);
+ //修改保安报名状态
+ user.setIsApply(1);
+ userService.updateById(user);
+ }
+ }
+ });
+ return R.data(200,"报名成功");
+ }
+
}
--
Gitblit v1.9.3