From 080d35399affa2ffc448d48a9ee7b0e5f6441252 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Tue, 13 Dec 2022 12:38:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/jlw/generalResourcesQuestionSnapshot.md | 2 +- web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md | 2 +- .../resources/sql/jlw/teacherOpenCourseQuestionSetting.md | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/web/src/main/resources/sql/jlw/generalResourcesQuestionSnapshot.md b/web/src/main/resources/sql/jlw/generalResourcesQuestionSnapshot.md index a9a521e7..c2ff4ce8 100644 --- a/web/src/main/resources/sql/jlw/generalResourcesQuestionSnapshot.md +++ b/web/src/main/resources/sql/jlw/generalResourcesQuestionSnapshot.md @@ -933,6 +933,6 @@ getQuestionTestSimpleInfo AND t.business_id in (select ba.course_info_id from course_info ba where ba.course_info_parent_id = #courseInfoParentId#) @pageIgnoreTag() { ORDER BY - t.general_question_setting_name ASC + CONVERT(regexp_replace ( t.general_question_setting_name, '[^0-9]+', '' ),unsigned) asc @} diff --git a/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md b/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md index 18bc7f2d..07f8cf6f 100644 --- a/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md +++ b/web/src/main/resources/sql/jlw/resourcesQuestionSnapshot.md @@ -727,7 +727,7 @@ getQuestionTestSimpleInfo AND t.teacher_open_course_id = #teacherOpenCourseId# @pageIgnoreTag() { ORDER BY - t.teacher_open_course_question_setting_name ASC + CONVERT(regexp_replace ( t.teacher_open_course_question_setting_name, '[^0-9]+', '' ),unsigned) asc @} diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md index b0181283..a77a47c7 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseQuestionSetting.md @@ -88,8 +88,10 @@ queryByCondition @if(!isEmpty(userIdPlural)){ and find_in_set(t.user_id,#userIdPlural#) @} + @pageIgnoreTag() { ORDER BY CONVERT(regexp_replace ( t.teacher_open_course_question_setting_name, '[^0-9]+', '' ),unsigned) asc + @} queryByConditionQuery === @@ -179,8 +181,11 @@ queryByConditionQuery @if(!isEmpty(userIdPlural)){ and find_in_set(t.user_id,#userIdPlural#) @} + @pageIgnoreTag() { ORDER BY CONVERT(regexp_replace ( t.teacher_open_course_question_setting_name, '[^0-9]+', '' ),unsigned) asc + @} + logicDeleteBySettingIds