From 090e7f57ee857cb247aa2c5060e0b84730bce82a Mon Sep 17 00:00:00 2001 From: maLix Date: Mon, 3 Jul 2023 23:20:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E3=80=81=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E3=80=81=E7=AB=A0=E8=8A=82=E7=BB=83=E4=B9=A0=20=E7=8F=AD?= =?UTF-8?q?=E7=BA=A7=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md | 3 ++- .../resources/sql/jlw/teacherOpenCourseQuestionSetting.md | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md b/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md index 02cb2948..31387917 100644 --- a/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md +++ b/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md @@ -744,7 +744,8 @@ getQuestionTestSimpleInfo AND t.teacher_open_course_question_setting_type = #teacherOpenCourseQuestionSettingType# AND t.teacher_open_course_id = #teacherOpenCourseId# @if(!isEmpty(classIds)){ - and find_in_set(t.teacher_open_course_question_setting_school_class_ids, #classIds#) + and IF + ( t.teacher_open_course_question_setting_school_class_ids = 'ALL', TRUE, t.teacher_open_course_question_setting_school_class_ids REGEXP #strUtil.join('|', classIds)#) @} AND ( select count(distinct(tb.resources_question_snapshot_id)) from resources_question_snapshot tb where tb.teacher_open_course_question_setting_id = t.teacher_open_course_question_setting_id diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md index f0e495a0..1bde4373 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md @@ -115,8 +115,10 @@ queryByConditionQuery @if(!isEmpty(teacherOpenCourseIdPlural)){ and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#) @} + @// 如果数据是ALL，则代表全部班级都可以看到 @if(!isEmpty(teacherOpenCourseQuestionSettingSchoolClassIds)){ - and find_in_set(t.teacher_open_course_question_setting_school_class_ids, #teacherOpenCourseQuestionSettingSchoolClassIds#) + and IF + ( t.teacher_open_course_question_setting_school_class_ids = 'ALL', TRUE, t.teacher_open_course_question_setting_school_class_ids REGEXP #strUtil.join('|', teacherOpenCourseQuestionSettingSchoolClassIds)#) @} @if(!isEmpty(teacherOpenCourseQuestionSettingDoCount)){ and t.teacher_open_course_question_setting_do_count =#teacherOpenCourseQuestionSettingDoCount#