From 6bd7ffcfcb0b5fb8dd1a5e95e78b07d9bb161f19 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 19 Aug 2021 12:06:15 +0800
Subject: [PATCH] 1.用户注册接口修改 2.保安公司列表查询接口修改
---
src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java b/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
index a0fd1e3..3e29119 100644
--- a/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
@@ -20,7 +20,9 @@
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.entity.ExamScore;
import org.springblade.modules.exam.service.ExamPaperService;
+import org.springblade.modules.exam.service.ExamScoreService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.training.entity.TrainingRegistration;
@@ -115,7 +117,7 @@
user1.setIsApply(1);
userService.updateById(user1);
}else {
- if (user1.getIsApply()==2 || -1==user.getIsApply()) {
+ if (user1.getIsApply()==2 || -1==user.getIsApply() || 3==user.getIsApply()) {
Apply apply1 = new Apply();
apply1.setApplyStatus(2);
//默认为未考试状态
@@ -407,9 +409,11 @@
public void updateApplyStatus(ApplyVO apply) {
//正式考
if (apply.getExamType()==1){
+ Apply apply1 = new Apply();
+ apply1.setId(apply.getId());
//考试中
- apply.setIsExam(3);
- baseMapper.updateById(apply);
+ apply1.setIsExam(3);
+ baseMapper.updateById(apply1);
}
//模拟考
if (apply.getExamType()==2){
--
Gitblit v1.9.3