From fb9a11176bcc50a356a6e4013be61e3eed47fa21 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Sun, 26 Feb 2023 15:30:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E9=A2=98=E7=9B=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jlw/service/GeneralQuestionLogService.java   | 12 ++++++++++++
 .../TeacherOpenCourseQuestionLogService.java     | 16 +++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java
index a7c3ac8a..cbe566a3 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java
@@ -668,6 +668,13 @@ public class GeneralQuestionLogService extends CoreBaseService<GeneralQuestionLo
                 questionLog.setStudentScore(studentScore);
                 // 是否是错题
                 questionLog.setIsErrorFavorite(NumberUtil.equals(studentScore, ZERO));
+                // 题目对错，按题目计算，不按照填空的数量算
+                if (NumberUtil.equals(studentScore, questionLog.getQuestionScore())) {
+                    questionLog.setSuccessCount(1);
+                }else {
+                    questionLog.setErrorCount(1);
+                }
+
             }else {
                 answersText = join(answer.split(","), ",");
                 // 是否是正确答案
@@ -676,6 +683,11 @@ public class GeneralQuestionLogService extends CoreBaseService<GeneralQuestionLo
                 // 学生得分
                 questionLog.setStudentScore(isCorrectAnswer ? questionLog.getQuestionScore() : ZERO);
                 questionLog.setIsErrorFavorite(!isCorrectAnswer);
+                if (isCorrectAnswer) {
+                    questionLog.setSuccessCount(1);
+                }else {
+                    questionLog.setErrorCount(1);
+                }
             }
 
             // 完成时间
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
index 353de227..9c92d976 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
@@ -522,7 +522,16 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
                 questionLog.setStudentScore(studentScore);
                 // 是否是错题
                 questionLog.setIsErrorFavorite(NumberUtil.equals(studentScore, ZERO));
-            }else {
+
+                // 题目对错，按题目计算，不按照填空的数量算
+                if (NumberUtil.equals(studentScore, questionLog.getQuestionScore())) {
+                    questionLog.setSuccessCount(1);
+                }else {
+                    questionLog.setErrorCount(1);
+                }
+            }
+            // 基础题目类型，单选多选判断 类型：1、2、3
+            else {
                 answersText = join(answer.split(","), ",");
                 // 是否是正确答案
                 Boolean isCorrectAnswer = questionLog.getQuestionAnswer().equalsIgnoreCase(answersText);
@@ -530,6 +539,11 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
                 // 学生得分
                 questionLog.setStudentScore(isCorrectAnswer ? questionLog.getQuestionScore() : ZERO);
                 questionLog.setIsErrorFavorite(!isCorrectAnswer);
+                if (isCorrectAnswer) {
+                    questionLog.setSuccessCount(1);
+                }else {
+                    questionLog.setErrorCount(1);
+                }
             }
 
             // 完成时间，从生成试卷时候，开始计算