From 659641f72cc1feeed93d3af09ca2e73f33a1cf77 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Sat, 8 Oct 2022 18:35:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9C=A8=E4=BD=9C=E7=AD=94?=
 =?UTF-8?q?=E4=BB=A5=E5=90=8E=EF=BC=8C=E6=8F=92=E5=85=A5=E9=94=99=E9=A2=98?=
 =?UTF-8?q?=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TeacherOpenCourseQuestionLogService.java  | 12 +++++---
 ...cherOpenCourseQuestionLogWrongService.java | 30 +++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)

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 ac338895..3e9ec6e4 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
@@ -61,6 +61,7 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
     @Resource private StudentDao studentDao;
     @Resource private ResourcesQuestionSnapshotDao resourcesQuestionSnapshotDao;
     @Resource private TeacherOpenCourseQuestionSettingService teacherOpenCourseQuestionSettingSettingService;
+    @Resource private TeacherOpenCourseQuestionLogWrongService teacherOpenCourseQuestionLogWrongService;
 
     public PageQuery<TeacherOpenCourseQuestionLog>queryByCondition(PageQuery query){
         PageQuery ret =  teacherOpenCourseQuestionLogDao.queryByCondition(query);
@@ -255,11 +256,11 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
                 .studentId(student.getStudentId())
                 .teacherOpenCourseQuestionSettingId(questionSettingId)
                 .build();
-        List<TeacherOpenCourseQuestionLog> valuesByQuery = teacherOpenCourseQuestionLogDao.getValuesByQuery(questionLogQuery);
+        List<TeacherOpenCourseQuestionLog> logList = teacherOpenCourseQuestionLogDao.getValuesByQuery(questionLogQuery);
 
-        Assert.notEmpty(valuesByQuery, "未查询到题目！");
+        Assert.notEmpty(logList, "未查询到题目！");
         // 处理答案和分数
-        valuesByQuery.forEach(questionLog -> {
+        logList.forEach(questionLog -> {
             // 学生提交的答案
             String answersText = join(questionLogMap.get(questionLog.getResourcesQuestionSnapshotId()).toArray(), ",");
             // 包含/字符，代表是路径地址，是附件类型
@@ -278,7 +279,10 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
             questionLog.setStudentScore(isCorrectAnswer ? questionLog.getQuestionScore() : BigDecimal.valueOf(0));
 
         });
-        updateBatch(valuesByQuery);
+        updateBatch(logList);
+
+        // 批量插入错题集，方法内部自带判断
+        teacherOpenCourseQuestionLogWrongService.insertBatchByQuestionLogList(logList);
     }
 
 
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogWrongService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogWrongService.java
index b6df2994..51ca72ab 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogWrongService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogWrongService.java
@@ -1,5 +1,7 @@
 package com.ibeetl.jlw.service;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.jlw.util.ToolUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -11,6 +13,7 @@ import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.admin.core.web.JsonReturnCode;
 import com.ibeetl.jlw.dao.TeacherOpenCourseQuestionLogWrongDao;
 import com.ibeetl.jlw.entity.FileEntity;
+import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLog;
 import com.ibeetl.jlw.entity.TeacherOpenCourseQuestionLogWrong;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionLogWrongQuery;
 import org.apache.commons.lang3.StringUtils;
@@ -29,6 +32,7 @@ import javax.annotation.Resource;
 import java.io.*;
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.ibeetl.admin.core.util.ExcelUtil.getCellFormatValue;
 
@@ -374,5 +378,31 @@ public class TeacherOpenCourseQuestionLogWrongService extends CoreBaseService<Te
         return teacherOpenCourseQuestionLogWrongDao.getExcelValues(teacherOpenCourseQuestionLogWrongQuery);
     }
 
+    /**
+     *
+     * 根据题目日志，插入到学生错题集。插入到数据，可以关联到试卷ID teacherOpenCourseQuestionSettingId
+     * 方法内部自带判断是否是错误的题目
+     *
+     * @param questionLogList
+     */
+    public void insertBatchByQuestionLogList(List<TeacherOpenCourseQuestionLog> questionLogList) {
+
+        // 空值直接返回
+        if(CollectionUtil.isEmpty(questionLogList)) { return; }
+
+        // 错题集
+        List<TeacherOpenCourseQuestionLog> questionWrongList = questionLogList.stream().filter(questionLog -> {
+            // 学生写答案了，并且也给打分了,但是呢，分数是0的情况。这个时候，就是错题了
+            return (null != questionLog.getStudentScore()
+                    && StringUtils.isNotBlank(questionLog.getTeacherOpenCourseQuestionLogAnswer())
+                    && questionLog.getStudentScore().compareTo(BigDecimal.ZERO) == 0);
+        }).collect(Collectors.toList());
+
+        // 判空
+        if(CollectionUtil.isEmpty(questionWrongList)) { return; }
+
+        // 除了ID，其他字段都一样。只为了记录错题集
+        insertBatch(BeanUtil.copyToList(questionWrongList, TeacherOpenCourseQuestionLogWrong.class));
+    }
 
 }