From 6beeb715fcef8db22b17c309ec8fecc45cc04b00 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 17 Aug 2021 16:30:47 +0800
Subject: [PATCH] 1.考试成绩查询修改 2.用户查询修改
---
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 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 83945ce..851b5e6 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -98,7 +98,7 @@
if (1==user.getIsApply()){
return R.data(201,"已报名，不能重复报名");
}
- if (2==user.getIsApply()){
+ if (2==user.getIsApply() || -1==user.getIsApply() || 3==user.getIsApply()){
//默认通过
apply.setApplyStatus(2);
//默认为未考试状态
@@ -389,12 +389,49 @@
return R.data(200,"取消报名成功");
}
}else {
+ if(user.getIsApply()==1){
+ apply.setApplyStatus(4);
+ boolean status = applyService.updateById(apply);
+ //修改保安报名状态
+ user.setIsApply(2);
+ userService.updateById(user);
+ if (status){
+ return R.data(200,"取消报名成功");
+ }
+ }else {
+ return R.data(201,"尚未报名");
+ }
+ }
+ return R.data(202,"取消报名失败");
+ }
+
+
+ /**
+ * 公司报名列表取消报名，无applyId
+ * @param apply 考试报名信息对象
+ */
+ @PostMapping("/cancelApplyNotApplyId")
+ public R cancelApplyNotApplyId(@RequestBody Apply apply){
+ //查询人员是否已报名
+ User user = userService.getById(apply.getUserId());
+ //查询报名信息，取最新的一条（即当前userId,）applyId最大的一条记录
+ Apply apply1 = applyService.getMaxApplyIdByUserIdInfo(apply.getUserId());
+ if(null==user.getIsApply()){
+ apply1.setApplyStatus(4);
+ boolean status = applyService.updateById(apply1);
+ //修改保安报名状态
+ 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);
+ apply1.setApplyStatus(4);
+ boolean status = applyService.updateById(apply1);
//修改保安报名状态
user.setIsApply(2);
userService.updateById(user);
@@ -430,7 +467,7 @@
user.setIsApply(1);
userService.updateById(user);
} else {
- if (user.getIsApply() == 2) {
+ if (user.getIsApply() == 2 || -1==user.getIsApply() || 3==user.getIsApply()) {
Apply apply1 = new Apply();
apply1.setApplyStatus(2);
//默认为未考试状态
@@ -447,6 +484,7 @@
}else {
//查询所有未报名的人员
List<User> users = userService.getNotApplyIdList(deptId);
+ System.out.println("users = " + users.size());
if (users.size()>0){
users.forEach(user ->{
//未报名的新增，已报名的不做处理
@@ -462,7 +500,7 @@
user.setIsApply(1);
userService.updateById(user);
} else {
- if (user.getIsApply() == 2) {
+ if (user.getIsApply() == 2 || -1==user.getIsApply() || 3==user.getIsApply()) {
Apply apply1 = new Apply();
apply1.setApplyStatus(2);
//默认为未考试状态
@@ -489,17 +527,17 @@
*/
@PostMapping("/batchExam")
public R batchExam(@RequestParam String ids,
- @RequestParam String examTime,
+ String examTime,
@RequestParam Date startTime,
- @RequestParam Date endTime){
+ Date endTime){
if (!ids.equals("")){
List<String> list = Arrays.asList(ids.split(","));
if (list.size()>0){
ExamPaper examPaper = new ExamPaper();
- examPaper.setExamTime(examTime);
+// examPaper.setExamTime(examTime);
examPaper.setExamType(1);
examPaper.setStartTime(startTime);
- examPaper.setEndTime(endTime);
+// examPaper.setEndTime(endTime);
Calendar instance = Calendar.getInstance();
instance.setTime(startTime);
int year = instance.get(Calendar.YEAR);
@@ -525,10 +563,10 @@
if (applyIds.size()>0){
//生成考试
ExamPaper examPaper = new ExamPaper();
- examPaper.setExamTime(examTime);
+// examPaper.setExamTime(examTime);
examPaper.setExamType(1);
examPaper.setStartTime(startTime);
- examPaper.setEndTime(endTime);
+// examPaper.setEndTime(endTime);
Calendar instance = Calendar.getInstance();
instance.setTime(startTime);
int year = instance.get(Calendar.YEAR);
--
Gitblit v1.9.3