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/service/impl/ExamScoreServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

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 fa3449a..95de5b6 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
@@ -85,8 +85,14 @@
 			}
 			//设置理论得分
 			examScore.setTheoryGrade(theoryGrade);
-			//计算总成绩
-			examScore.setAllGrade(theoryGrade + examScore.getLearnGrade());
+			//计算总成绩,此时没有实操成绩,总成绩为实操成绩和理论成绩和的一半
+			examScore.setAllGrade(Math.round(theoryGrade/2));
+			//设置状态
+			if (theoryGrade>=60){
+				examScore.setQualified(2);
+			}else {
+				examScore.setQualified(1);
+			}
 			//保存成绩数据
 			int i = baseMapper.insert(examScore);
 			if (i>0){

--
Gitblit v1.9.3