From 33a072160eda4fa7cb22d330c2bfa9048ad6c0e9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 22 Jul 2021 14:11:50 +0800
Subject: [PATCH] 派遣记录接口修改
---
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 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 32f2265..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,8 +13,6 @@
import org.springblade.modules.exam.vo.ExamScoreVO;
import org.springframework.web.bind.annotation.*;
-import java.util.Date;
-
/**
* @author zhongrj
* @time 2021-07-16
@@ -57,6 +55,17 @@
return R.status(examScoreService.save(examScore));
}
+
+ /**
+ * 保存考试成绩
+ * @param examScore 考试成绩信息对象
+ */
+ @PostMapping("/saveExamScore")
+ public R saveExamScore(@RequestBody ExamScoreVO examScore) {
+ return R.status(examScoreService.saveExamScore(examScore));
+ }
+
+
/**
* 修改
* @param examScore 考试成绩信息对象
@@ -67,14 +76,31 @@
}
/**
+ * 修改总成绩
+ * @param examScore 考试成绩信息对象
+ */
+ @PostMapping("/updateExamScore")
+ public R updateExamScore(@RequestBody ExamScore examScore) {
+ if (null!=examScore.getLearnGrade() && null!=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));
+ }
+
+ /**
* 新增或修改
* @param examScore 考试成绩信息对象
*/
@PostMapping("/submit")
public R submit(@RequestBody ExamScore examScore) {
-// if (null!=examScore.getId()){
-// examScore.setExamTime(new Date());
-// }
return R.status(examScoreService.saveOrUpdate(examScore));
}
--
Gitblit v1.9.3