From f1d7ec8a816a5fc99f60a425ad4f3270d995e269 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 17 Jul 2021 09:56:00 +0800
Subject: [PATCH] 考试成绩计算接口修改，修改为先匹配题目id，再匹配答案
---
src/main/java/org/springblade/modules/exam/vo/ExamResultVO.java | 5 +++++
src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java | 15 ++++++++++++---
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 3 ---
3 files changed, 17 insertions(+), 6 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..6236650 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
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 1f8944b..9870fb5 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
@@ -69,9 +69,18 @@
//比对考试结果
//声明理论得分
int theoryGrade = 0;
- for (int i = 0; i < examResultVOS.size(); i++) {
- if (examResultVOS.get(i).getValue().equals(examExaminationSubjects.get(i).getExamSubjectChoices().getAnswer())){
- theoryGrade += examResultVOS.get(i).getGrade();
+ for (ExamResultVO examResultVO : examResultVOS) {
+ for (ExamExaminationSubject examExaminationSubject : examExaminationSubjects) {
+ //对比题目id
+ if (examResultVO.getSubjectChoicesId().equals(examExaminationSubject.getSubjectId())) {
+ //对比答案
+ if (examResultVO.getValue().equals(examExaminationSubject.getExamSubjectChoices().getAnswer())) {
+ theoryGrade += examResultVO.getGrade();
+ }
+ //移除当前试卷题目答案对象
+ examExaminationSubjects.remove(examExaminationSubject);
+ break;
+ }
}
}
//设置理论得分
diff --git a/src/main/java/org/springblade/modules/exam/vo/ExamResultVO.java b/src/main/java/org/springblade/modules/exam/vo/ExamResultVO.java
index 32d4c9f..6f78663 100644
--- a/src/main/java/org/springblade/modules/exam/vo/ExamResultVO.java
+++ b/src/main/java/org/springblade/modules/exam/vo/ExamResultVO.java
@@ -12,6 +12,11 @@
private static final long serialVersionUID = 1L;
/**
+ * 题目id
+ */
+ private Long subjectChoicesId;
+
+ /**
* 提交的答案
*/
private String value;
--
Gitblit v1.9.3