From 128447d263b3f5cac53cf10d0decc2b2172c5f0d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 02 Aug 2021 11:56:21 +0800
Subject: [PATCH] 代码同步
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 1 +
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 2 ++
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 2 ++
src/main/java/org/springblade/modules/directive/controller/DirectiveController.java | 6 +++---
4 files changed, 8 insertions(+), 3 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 335ebff..f8875d8 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -102,6 +102,8 @@
apply.setApplyCode(getApplyCode(apply));
//默认通过
apply.setApplyStatus(2);
+ //默认为未考试状态
+ apply.setIsExam(1);
apply.setApplyTime(new Date());
}
return R.status(applyService.saveOrUpdate(apply));
diff --git a/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java b/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java
index f9c98c5..f177f28 100644
--- a/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java
+++ b/src/main/java/org/springblade/modules/directive/controller/DirectiveController.java
@@ -75,9 +75,9 @@
@PostMapping("/saveDirectiveAndFile")
public R saveDirectiveAndFile(@RequestBody DirectiveVo directive) {
//新增指令信息
- boolean save = directiveService.save(directive);
boolean status = false;
- if (save){
+ status = directiveService.save(directive);
+ if (status){
//新增图片
if (null!=directive.getUrl() && directive.getUrl()!=""){
String[] directiveUrl = directive.getUrl().split(",");
@@ -88,7 +88,7 @@
directiveFile.setUrl(url);
status = directiveService.saveDirectiveFile(directiveFile);
if (!status){
- R.status(false);
+ return R.status(false);
}
}
}
diff --git a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
index 617bc0e..8f968f7 100644
--- a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
+++ b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
@@ -112,6 +112,8 @@
}
//保存成绩数据
int i = baseMapper.insert(examScore);
+ //修改考试状态为已考试，当前报名已考试，无法再考
+
if (i>0){
//返回结果
return true;
diff --git a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
index e60cb7c..c9fd352 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -43,6 +43,7 @@
@PostMapping("/save")
@ApiOperation(value = "新增", notes = "传入trainingRegistration")
public R save(@RequestBody TrainingRegistration trainingRegistration) {
+ //默认报名未考试状态
return R.status(trainingRegistrationService.save(trainingRegistration));
}
--
Gitblit v1.9.3