From 748bd2dff7201eea3adaa1adbd459be4f0cc75d3 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 19 Jul 2021 11:38:28 +0800
Subject: [PATCH] 问题修复

---
 src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java |   34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 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 af64c5f..f8c09c8 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
@@ -75,19 +75,27 @@
 					//对比题目id
 					if (examResultVO.getSubjectChoicesId().equals(examExaminationSubject.getExamSubjectChoices().getId())) {
 						//对比答案
-						//处理多选题的答案排序
-						String[] split = examResultVO.getValue().split(",");
-						StringBuilder builder = new StringBuilder();
-						for (String s : split) {
-							builder.append(s);
-						}
-						char[] arrayCh = builder.toString().toCharArray();
-						//利用数组帮助类自动排序
-						Arrays.sort(arrayCh);
-						String sub0 = Arrays.toString(arrayCh);
-						String sub = sub0.substring(1,sub0.length()-1).replaceAll(" ","");
-						if (sub.equals(examExaminationSubject.getExamSubjectChoices().getAnswer())) {
-							theoryGrade += examResultVO.getGrade();
+
+						if (examExaminationSubject.getExamSubjectChoices().getChoicesType() == 2){
+							//判断题逻辑
+							if (examResultVO.getValue().equals(examExaminationSubject.getExamSubjectChoices().getAnswer())) {
+								theoryGrade += examResultVO.getGrade();
+							}
+						}else if(examExaminationSubject.getExamSubjectChoices().getChoicesType() == 0 || examExaminationSubject.getExamSubjectChoices().getChoicesType() == 1){
+							//处理多选题的答案排序
+							String[] split = examResultVO.getValue().split(",");
+							StringBuilder builder = new StringBuilder();
+							for (String s : split) {
+								builder.append(s);
+							}
+							char[] arrayCh = builder.toString().toCharArray();
+							//利用数组帮助类自动排序
+							Arrays.sort(arrayCh);
+							String sub0 = Arrays.toString(arrayCh);
+							String sub = sub0.substring(1,sub0.length()-1).replaceAll(" ","");
+							if (sub.equals(examExaminationSubject.getExamSubjectChoices().getAnswer())) {
+								theoryGrade += examResultVO.getGrade();
+							}
 						}
 						//移除当前试卷题目答案对象
 						examExaminationSubjects.remove(examExaminationSubject);

--
Gitblit v1.9.3