1

web/src/main/resources/sql/jlw/teacherOpenCourseMergeResourcesQuestion.md

@@ -767,29 +767,26 @@ getRandomMergeResourcesQuestionListByChapterTestQuestion
       SELECT DISTINCT
       b.teacher_open_course_id,
       b.teacher_open_course_question_setting_type,
-      a.question_type,
-      a.question_stem,
-      a.question_option_a,
-      a.question_option_b,
-      a.question_option_c,
-      a.question_option_d,
-      a.question_option_e,
-      a.question_answer,
-      a.question_score,
-      a.question_analysis,
-      a.question_status,
+      c.teacher_open_course_merge_resources_question_id,
+      ifnull(a.question_type, c.question_type) as question_type,
+      ifnull(a.question_stem, c.question_stem) as question_stem,
+      ifnull(a.question_option_a, c.question_option_a) as question_option_a,
+      ifnull(a.question_option_b, c.question_option_b) as question_option_b,
+      ifnull(a.question_option_c, c.question_option_c) as question_option_c,
+      ifnull(a.question_option_d, c.question_option_d) as question_option_d,
+      ifnull(a.question_option_e, c.question_option_e) as question_option_e,
+      ifnull(a.question_answer, c.question_answer) as question_answer,
+      ifnull(a.question_score, c.question_score) as question_score,
+      ifnull(a.question_analysis, c.question_analysis) as question_analysis,
+      ifnull(a.question_status, c.question_status)  as question_status,
       b.user_id,
       b.org_id
       FROM
-      resources_question_snapshot a,
-      teacher_open_course_question_setting b,
       teacher_open_course_merge_resources_question c
+      inner join teacher_open_course_question_setting b on c.teacher_open_course_id = b.teacher_open_course_id
+      left join resources_question_snapshot a on a.teacher_open_course_merge_resources_question_id = c.teacher_open_course_merge_resources_question_id AND a.question_status = 1
       WHERE
       1
-      AND a.teacher_open_course_question_setting_id = a.teacher_open_course_question_setting_id
-      AND a.teacher_open_course_merge_resources_question_id = c.teacher_open_course_merge_resources_question_id
-      AND c.teacher_open_course_id = b.teacher_open_course_id
-      AND a.question_status = 1
       AND c.question_status = 1
       @if(!isEmpty(teacherOpenCourseId)){
       AND b.teacher_open_course_id = #teacherOpenCourseId#