From 29cec619e492991593536a98fd854d88a09c9e7f Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Fri, 24 Mar 2023 20:39:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=B7=B2=E7=BB=8F=E4=BA=A4?=
 =?UTF-8?q?=E5=8D=B7=E7=9A=84=E9=A2=98=E7=9B=AE=E7=AD=94=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ibeetl/jlw/service/GeneralQuestionLogService.java    | 4 +++-
 .../ibeetl/jlw/service/GeneralQuestionSettingService.java    | 4 ++--
 .../jlw/service/TeacherOpenCourseQuestionLogService.java     | 5 ++++-
 .../jlw/service/TeacherOpenCourseQuestionSettingService.java | 5 +++--
 .../com/ibeetl/jlw/web/GeneralQuestionSettingController.java | 2 +-
 .../jlw/web/TeacherOpenCourseQuestionSettingController.java  | 2 +-
 6 files changed, 14 insertions(+), 8 deletions(-)

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 ca9f1576..c0698c84 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionLogService.java
@@ -995,7 +995,7 @@ public class GeneralQuestionLogService extends CoreBaseService<GeneralQuestionLo
                                             @NotNull(message = "题目配置ID不能为空！") final Long questionSettingId,
                                             @Nullable QuestionLogAddTypeEnum preAddType,
                                             @NotEmpty(message = "题目快照列表不能为空！") List<GeneralResourcesQuestionSnapshot> resourcesQuestionSnapshots,
-                                            boolean isReSend
+                                            boolean isReSend, CoreUser coreUser
     ) {
 
         if (CollectionUtil.isEmpty(resourcesQuestionSnapshots)) {
@@ -1036,6 +1036,8 @@ public class GeneralQuestionLogService extends CoreBaseService<GeneralQuestionLo
             questionLog.setStudentId(studentId);
             questionLog.setGeneralQuestionLogAddTime(new Date());
             questionLog.setQuestionAnswer(questionAnswer);
+            questionLog.setOrgId(coreUser.getOrgId());
+            questionLog.setUserId(coreUser.getId());
         });
 
         insertBatch(generalQuestionLogs);
diff --git a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionSettingService.java b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionSettingService.java
index e49a60d1..18be3422 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionSettingService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionSettingService.java
@@ -489,7 +489,7 @@ public class GeneralQuestionSettingService extends CoreBaseService<GeneralQuesti
      * @return
      */
     public List<GeneralResourcesQuestionSnapshot> questionDetail(@NotNull(message = "题目配置ID不能为空！") final Long generalQuestionSettingId,
-                                                          @NotNull(message = "类型不能为空！") ResourcesQuestionSnapshotFromTypeEnum fromTypeEnum) {
+                                                          @NotNull(message = "类型不能为空！") ResourcesQuestionSnapshotFromTypeEnum fromTypeEnum, CoreUser coreUser) {
 
         // 获取学生ID
         final Student student = getStudent();
@@ -561,7 +561,7 @@ public class GeneralQuestionSettingService extends CoreBaseService<GeneralQuesti
 
         {
             // 做题日志关联学生, 初步提交做题日志信息，不包含学生提交的答案和得分情况
-            generalQuestionLogService.preSubmitStudentQuestionLog(studentId, generalQuestionSettingId, null, resourcesQuestionSnapshots, selectIsReSend);
+            generalQuestionLogService.preSubmitStudentQuestionLog(studentId, generalQuestionSettingId, null, resourcesQuestionSnapshots, selectIsReSend, coreUser);
             // 学生身份，需要屏蔽答案，再丢给前端
             resourcesQuestionSnapshots.forEach(GeneralResourcesQuestionSnapshot::hideAnswer);
         }
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 6949cdc8..7fab05c0 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java
@@ -11,6 +11,7 @@ import cn.hutool.json.JSONUtil;
 import cn.jlw.util.ToolUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.service.CoreBaseService;
 import com.ibeetl.admin.core.service.CoreDictService;
 import com.ibeetl.admin.core.util.PlatformException;
@@ -858,7 +859,7 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
                                             @NotNull(message = "判断是否继续做题的，题目提交类型不能为空！") final QuestionLogAddTypeEnum judgeAddType,
                                             @Nullable final QuestionLogAddTypeEnum initAddType,
                                             @NotEmpty(message = "题目快照列表不能为空！") List<ResourcesQuestionSnapshot> resourcesQuestionSnapshots,
-                                            final boolean isReSend
+                                            final boolean isReSend, CoreUser coreUser
     ) {
 
         if (CollectionUtil.isEmpty(resourcesQuestionSnapshots)) {
@@ -898,6 +899,8 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher
             questionLog.setStudentId(studentId);
             questionLog.setTeacherOpenCourseQuestionLogAddTime(new Date());
             questionLog.setQuestionAnswer(questionAnswer);
+            questionLog.setOrgId(coreUser.getOrgId());
+            questionLog.setUserId(coreUser.getId());
         });
 
         insertBatch(teacherOpenCourseQuestionLogs);
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java
index 0d33a6ed..7dd2939b 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java
@@ -15,6 +15,7 @@ import cn.jlw.util.ToolUtils;
 import cn.jlw.validate.ValidateConfig;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.service.CoreBaseService;
 import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.admin.core.web.JsonResult;
@@ -741,7 +742,7 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
      * @return
      */
     public List<ResourcesQuestionSnapshot> questionDetail(@NotNull(message = "题目配置ID不能为空！") final Long teacherOpenCourseQuestionSettingId,
-                                                          @NotNull(message = "类型不能为空！") ResourcesQuestionSnapshotFromTypeEnum fromTypeEnum) {
+                                                          @NotNull(message = "类型不能为空！") ResourcesQuestionSnapshotFromTypeEnum fromTypeEnum, CoreUser coreUser) {
 
         // 获取学生ID
         final Student student = getStudent();
@@ -815,7 +816,7 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
 
         {
             // 做题日志关联学生, 初步提交做题日志信息，不包含学生提交的答案和得分情况
-            teacherOpenCourseQuestionLogService.preSubmitStudentQuestionLog(studentId, teacherOpenCourseQuestionSettingId, PRE_SUBMIT, null, resourcesQuestionSnapshots, selectIsReSend);
+            teacherOpenCourseQuestionLogService.preSubmitStudentQuestionLog(studentId, teacherOpenCourseQuestionSettingId, PRE_SUBMIT, null, resourcesQuestionSnapshots, selectIsReSend, coreUser);
             // 学生身份，需要屏蔽答案，再丢给前端
             resourcesQuestionSnapshots.forEach(ResourcesQuestionSnapshot::hideAnswer);
         }
diff --git a/web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionSettingController.java b/web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionSettingController.java
index ca18a535..ef052ae2 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionSettingController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/GeneralQuestionSettingController.java
@@ -145,7 +145,7 @@ public class GeneralQuestionSettingController{
     @PostMapping(API + "/questionDetail.do")
     public JsonResult questionDetail(Long generalQuestionSettingId,
                                      ResourcesQuestionSnapshotFromTypeEnum fromTypeEnum, @SCoreUser CoreUser coreUser) {
-        return JsonResult.success(generalQuestionSettingService.questionDetail(generalQuestionSettingId, fromTypeEnum));
+        return JsonResult.success(generalQuestionSettingService.questionDetail(generalQuestionSettingId, fromTypeEnum, coreUser));
     }
 
     /**
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java
index 04afe97f..c8341034 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionSettingController.java
@@ -125,7 +125,7 @@ public class TeacherOpenCourseQuestionSettingController{
     @PostMapping(API + "/questionDetail.do")
     public JsonResult questionDetail(Long teacherOpenCourseQuestionSettingId,
                                      ResourcesQuestionSnapshotFromTypeEnum fromTypeEnum, @SCoreUser CoreUser coreUser) {
-        return JsonResult.success(teacherOpenCourseQuestionSettingService.questionDetail(teacherOpenCourseQuestionSettingId, fromTypeEnum));
+        return JsonResult.success(teacherOpenCourseQuestionSettingService.questionDetail(teacherOpenCourseQuestionSettingId, fromTypeEnum, coreUser));
     }
 
     /**