From 30ec3bd40d36ed424dfda162752e08fae074f375 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 11 Aug 2021 17:08:17 +0800
Subject: [PATCH] 报名考试，成绩计算接口修改
---
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 126 +++++++++++++++++++++--------------------
1 files changed, 64 insertions(+), 62 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 bf57b07..fa2658f 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -72,13 +72,48 @@
}
/**
- * 新增
+ * 新增报名
* @param apply 考试报名信息对象
*/
@PostMapping("/save")
@ApiOperation(value = "新增", notes = "传入apply")
public R save(@RequestBody Apply apply) {
- return R.status(applyService.save(apply));
+ //查询人员是否已报名
+ User user = userService.getById(apply.getUserId());
+ if (null==user.getIsApply()){
+ //默认通过
+ apply.setApplyStatus(2);
+ //默认为未考试状态
+ apply.setIsExam(1);
+ apply.setApplyTime(new Date());
+ //报名
+ applyService.save(apply);
+ //修改保安报名状态
+ 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());
+ applyService.save(apply);
+ //修改保安报名状态
+ User user1 = new User();
+ user1.setId(apply.getUserId());
+ user1.setIsApply(1);
+ userService.updateById(user1);
+ return R.data(200,"报名成功");
+ }
+ }
+ return R.data(202,"报名失败");
}
@@ -96,66 +131,8 @@
* @param apply 考试报名信息对象
*/
@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.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);
- return R.data(200,"取消报名成功");
- }
-// //内网修改
-// if(null!=apply.getId()){
-// //修改
-// arg.test01(arg.url+"/apply/update",apply);
-// }
- return R.data(202,"报名失败");
+ public R submit(@RequestBody Apply apply){
+ return R.data(applyService.saveOrUpdate(apply));
}
@@ -353,6 +330,19 @@
}
/**
+ * 查询用户详情
+ * @param user
+ */
+ @GetMapping("/userDetail")
+ @ApiOperation(value = "详情", notes = "传入apply")
+ public R<User> details(User user) {
+ //用户详情
+ User user1 = userService.getById(user.getId());
+ //返回
+ return R.data(user1);
+ }
+
+ /**
* 详情
* @param apply 考试报名信息对象
*/
@@ -389,6 +379,7 @@
public R cancelApply(@RequestBody Apply apply){
//查询人员是否已报名
User user = userService.getById(apply.getUserId());
+ System.out.println("user = " + user);
if(null==user.getIsApply()){
apply.setApplyStatus(4);
boolean status = applyService.updateById(apply);
@@ -538,4 +529,15 @@
return applyService.getApplyDetailList(apply);
}
+
+ /**
+ * 查询保安员个人报名信息
+ * @param apply 报名信息，包含userId
+ * @return
+ */
+ @GetMapping("/getSecurityApplyDetail")
+ public ApplyVO getSecurityApplyDetail(ApplyVO apply){
+ return applyService.getSecurityApplyDetail(apply);
+ }
+
}
--
Gitblit v1.9.3