获取已经交卷的题目答案

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);

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);
         }

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);

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);
         }

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));
     }
 
     /**

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));
     }
 
     /**