From b1069fbf8e1a9ce06b9497f2470d7846458cf02c Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Sun, 27 Nov 2022 20:09:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E7=9B=AE=E5=BF=AB=E7=85=A7=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=EF=BC=8C=E9=99=84=E5=B8=A6=E5=AD=A6=E7=94=9F=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E7=9A=84=E7=AD=94=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...acherOpenCourseQuestionSettingService.java |  2 ++
 .../query/ResourcesQuestionSnapshotQuery.java |  5 ++++
 .../resources/sql/jlw/generalQuestionLog.md   | 27 +-----------------
 .../jlw/generalResourcesQuestionSnapshot.md   | 19 +++++++++++++
 .../sql/jlw/resourcesQuestionSnapshot.md      | 28 ++++++++++++-------
 5 files changed, 45 insertions(+), 36 deletions(-)

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 ea41d525..6ca208ca 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java
@@ -678,6 +678,8 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService<Tea
 
         ResourcesQuestionSnapshotQuery questionSnapshotQuery = new ResourcesQuestionSnapshotQuery();
         questionSnapshotQuery.setTeacherOpenCourseQuestionSettingId(teacherOpenCourseQuestionSettingId);
+        // 学生ID
+        questionSnapshotQuery.setStudentId(student.getStudentId());
 
         // 答卷后显示答案解析
         if (TRUE_CONST.equals(hwSetting.getTeacherOpenCourseQuestionSettingEndShowQa())) {
diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java
index 41ff70d3..a1d38816 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesQuestionSnapshotQuery.java
@@ -65,8 +65,13 @@ public class ResourcesQuestionSnapshotQuery extends PageParam {
 
     private String _given;//指定更新的特定字段，多个逗号隔开
 
+    // 扩展数据
     // 是否乱序
+
     private boolean rand;
+    // 学生ID
+
+    private Long studentId;
 
     public ResourcesQuestionSnapshot pojo(){
         ResourcesQuestionSnapshot pojo = new ResourcesQuestionSnapshot();
diff --git a/web/src/main/resources/sql/jlw/generalQuestionLog.md b/web/src/main/resources/sql/jlw/generalQuestionLog.md
index 5696a8c1..31809ac4 100644
--- a/web/src/main/resources/sql/jlw/generalQuestionLog.md
+++ b/web/src/main/resources/sql/jlw/generalQuestionLog.md
@@ -661,16 +661,6 @@ getValuesByQueryNotWithPermission
 * 根据不为空的参数进行查询（不包含权限）
 
   select t.*
-  @if(has(studentId) && !isEmpty(studentId)){
-  ,(select b.general_question_log_answer
-  from general_question_log b
-  where 1 = 1 and  b.student_id = #studentId#
-  and b.general_question_log_status = 1
-  and b.general_question_setting_id = t.general_question_setting_id
-  and b.general_resources_question_snapshot_id = t.general_resources_question_snapshot_id
-  order by general_question_log_add_time desc limit 1
-  ) as student_answer
-  @}
   from general_question_log t
   where 1=1
   @if(!isEmpty(generalQuestionLogId)){
@@ -1231,19 +1221,4 @@ getQuestionLogScoreDetailsInfo
   ta.student_sn,
   ta.class_id,
   tb.class_name
-  ) tz
-
-validateQuestionLogAddTimeLatest
-===
-* 验证前端传递过来的添加时间是否是最新的
-  select
-  if(t.general_question_log_update_time is null, true, t.general_question_log_update_time < #addTime#)
-  from
-  general_question_log t
-  where 1 = 1
-  and t.general_question_setting_id = #questionSettingId#
-  and FIND_IN_SET(t.general_resources_question_snapshot_id, #questionSnapshotIds#)
-  and t.student_id = #studentId#
-  and t.general_question_log_status = 1
-  order by general_question_log_add_time desc
-  limit 1
\ No newline at end of file
+  ) tz
\ No newline at end of file
diff --git a/web/src/main/resources/sql/jlw/generalResourcesQuestionSnapshot.md b/web/src/main/resources/sql/jlw/generalResourcesQuestionSnapshot.md
index bdb54281..07d275e0 100644
--- a/web/src/main/resources/sql/jlw/generalResourcesQuestionSnapshot.md
+++ b/web/src/main/resources/sql/jlw/generalResourcesQuestionSnapshot.md
@@ -5,6 +5,7 @@ queryByCondition
   select
   @pageTag(){
   t.*
+  #use("selectStudentAnswerFragment")#
   @}
   from general_resources_question_snapshot t
   where 1=1  
@@ -91,6 +92,7 @@ queryByConditionQuery
   select
   @pageTag(){
   t.*
+  #use("selectStudentAnswerFragment")#
   @}
   from general_resources_question_snapshot t
   where 1=1  
@@ -322,6 +324,7 @@ getGeneralResourcesQuestionSnapshotValues
 * 根据不为空的参数进行查询
 
   select t.*
+  #use("selectStudentAnswerFragment")#
   from general_resources_question_snapshot t
   where 1=1  
   @if(!isEmpty(generalResourcesQuestionSnapshotId)){
@@ -383,6 +386,7 @@ getValuesByQuery
 * 根据不为空的参数进行查询
 
   select t.*
+  #use("selectStudentAnswerFragment")#
   from general_resources_question_snapshot t
   where 1=1 and #function("generalResourcesQuestionSnapshot.query")#
   @if(!isEmpty(generalResourcesQuestionSnapshotId)){
@@ -458,6 +462,20 @@ getValuesByQuery
   and find_in_set(t.org_id,#orgIdPlural#)
   @}
 
+selectStudentAnswerFragment
+===
+* 查询学生的分数
+
+  @if(!isEmpty(studentId!)){
+  ,(select b.general_question_log_answer
+  from general_question_log b
+  where 1 = 1 and  b.student_id = #studentId#
+  and b.general_question_log_status = 1
+  and b.general_question_setting_id = t.general_question_setting_id
+  and b.general_resources_question_snapshot_id = t.general_resources_question_snapshot_id
+  order by general_question_log_add_time desc limit 1
+  ) as student_answer
+  @}
 
 getValuesByQueryNotWithPermission
 ===
@@ -465,6 +483,7 @@ getValuesByQueryNotWithPermission
 * 根据不为空的参数进行查询（不包含权限）
 
   select t.*
+  #use("selectStudentAnswerFragment")#
   from general_resources_question_snapshot t
   where 1=1
   @if(!isEmpty(generalResourcesQuestionSnapshotId)){
diff --git a/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md b/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md
index 24c9dc98..fa7a32c4 100644
--- a/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md
+++ b/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md
@@ -476,22 +476,30 @@ getValuesByQuery
   @}
   asc
 
+
+selectStudentAnswerFragment
+===
+* 查询学生的分数
+
+  @if(!isEmpty(studentId!)){
+  ,(select b.teacher_open_course_question_log_answer
+  from teacher_open_course_question_log b
+  where 1 = 1 and  b.student_id = #studentId#
+  and b.teacher_open_course_question_log_status = 1
+  and b.teacher_open_course_question_setting_id = t.teacher_open_course_question_setting_id
+  and b.resources_question_snapshot_id = t.resources_question_snapshot_id
+  order by teacher_open_course_question_log_add_time desc limit 1
+  ) as student_answer
+  @}
+
+
 getValuesByQueryNotWithPermission
 ===
 
 * 根据不为空的参数进行查询
 
   select t.*
-  @if(has(studentId) && !isEmpty(studentId)){
-    ,(select b.teacher_open_course_question_log_answer 
-      from teacher_open_course_question_log b 
-      where 1 = 1 and  b.student_id = #studentId# 
-        and b.teacher_open_course_question_log_status = 1
-        and b.teacher_open_course_question_setting_id = t.teacher_open_course_question_setting_id
-        and b.resources_question_snapshot_id = t.resources_question_snapshot_id
-        order by teacher_open_course_question_log_add_time desc limit 1
-      ) as student_answer
-  @}
+  #use("selectStudentAnswerFragment")#
   from resources_question_snapshot t
   where 1=1
   @if(!isEmpty(resourcesQuestionSnapshotId)){