From 0864cefcd2bc241b86c483ccdb00c0691e2b2ee0 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sun, 18 Jul 2021 19:12:53 +0800
Subject: [PATCH] 考试成绩计算修改,多选题排序

---
 src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java |   14 +++++++++++++-
 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml             |    8 ++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
index 3f8e6f5..b957086 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -5,7 +5,9 @@
     <!--考试成绩分页信息-->
     <select id="selectExamScorePage" resultType="org.springblade.modules.exam.vo.ExamScoreVO">
         SELECT
-            *
+         id,candidate_no candidateNo,theory_grade theoryGrade,isnull(learn_grade,-1) learnGrade,all_grade,
+         exam_name examName,security_name securityName,exam_type examType,company,exam_time examTime,
+         all_score allScore,exam_end_time examEndTime,qualified
         FROM
             exam_score
         WHERE
@@ -27,7 +29,9 @@
     <!--考试成绩详情信息-->
     <select id="selectExamScoreInfo" resultType="org.springblade.modules.exam.vo.ExamScoreVO">
         SELECT
-            *
+            id,candidate_no candidateNo,theory_grade theoryGrade,isnull(learn_grade,-1) learnGrade,all_grade,
+            exam_name examName,security_name securityName,exam_type examType,company,exam_time examTime,
+            all_score allScore,exam_end_time examEndTime,qualified
         FROM
             exam_score
         WHERE
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 95de5b6..af64c5f 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
@@ -18,6 +18,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -74,7 +75,18 @@
 					//对比题目id
 					if (examResultVO.getSubjectChoicesId().equals(examExaminationSubject.getExamSubjectChoices().getId())) {
 						//对比答案
-						if (examResultVO.getValue().equals(examExaminationSubject.getExamSubjectChoices().getAnswer())) {
+						//处理多选题的答案排序
+						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();
 						}
 						//移除当前试卷题目答案对象

--
Gitblit v1.9.3