From 396182b0fc92a91260f6acc36e68095b80874136 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sun, 18 Jul 2021 16:58:25 +0800
Subject: [PATCH] 考试成绩计算修改，新增是否合格字段
---
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
index 0b1db56..9331b8e 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -13,9 +13,6 @@
import org.springblade.modules.exam.vo.ExamScoreVO;
import org.springframework.web.bind.annotation.*;
-import java.util.Date;
-import java.util.List;
-
/**
* @author zhongrj
* @time 2021-07-16
@@ -85,7 +82,15 @@
@PostMapping("/updateExamScore")
public R updateExamScore(@RequestBody ExamScore examScore) {
if (null!=examScore.getLearnGrade() && null!=examScore.getTheoryGrade()){
- examScore.setAllGrade(examScore.getLearnGrade()+examScore.getTheoryGrade());
+ if (examScore.getTheoryGrade()>=60 && examScore.getLearnGrade()>=60){
+ //合格
+ examScore.setQualified(0);
+ }else {
+ //不合格
+ examScore.setQualified(1);
+ }
+ int totalSocre = examScore.getLearnGrade()+examScore.getTheoryGrade();
+ examScore.setAllGrade(Math.round(totalSocre/2));
}
return R.status(examScoreService.updateById(examScore));
}
--
Gitblit v1.9.3