修改字段修改后的bug

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

@@ -17,10 +17,10 @@ queryByCondition
   and find_in_set(t.teacher_open_course_merge_resources_info_id,#teacherOpenCourseMergeResourcesInfoIdPlural#)
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  and t.course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){
-  and find_in_set(t.course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
+  and find_in_set(t.teacher_open_course_merge_course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
   @}
   @if(!isEmpty(teacherOpenCourseId)){
   and t.teacher_open_course_id =#teacherOpenCourseId#
@@ -68,10 +68,10 @@ queryByConditionQuery
   and find_in_set(t.teacher_open_course_merge_resources_info_id,#teacherOpenCourseMergeResourcesInfoIdPlural#)
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  and t.course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){
-  and find_in_set(t.course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
+  and find_in_set(t.teacher_open_course_merge_course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
   @}
   @if(!isEmpty(teacherOpenCourseId)){
   and t.teacher_open_course_id =#teacherOpenCourseId#
@@ -128,9 +128,9 @@ updateGivenByIds
   set
   @if(contain("teacherOpenCourseMergeCourseInfoId",_given)){
   @if(isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  course_info_id = null ,
+  teacher_open_course_merge_course_info_id = null ,
   @}else{
-  course_info_id = #teacherOpenCourseMergeCourseInfoId# ,
+  teacher_open_course_merge_course_info_id = #teacherOpenCourseMergeCourseInfoId# ,
   @}
   @}
   @if(contain("teacherOpenCourseId",_given)){
@@ -192,7 +192,7 @@ getTeacherOpenCourseMergeResourcesInfoValues
   and t.teacher_open_course_merge_resources_info_id =#teacherOpenCourseMergeResourcesInfoId#
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  and t.course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
   @}
   @if(!isEmpty(teacherOpenCourseId)){
   and t.teacher_open_course_id =#teacherOpenCourseId#
@@ -229,10 +229,10 @@ getValuesByQuery
   and find_in_set(t.teacher_open_course_merge_resources_info_id,#teacherOpenCourseMergeResourcesInfoIdPlural#)
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  and t.course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){
-  and find_in_set(t.course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
+  and find_in_set(t.teacher_open_course_merge_course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
   @}
   @if(!isEmpty(teacherOpenCourseId)){
   and t.teacher_open_course_id =#teacherOpenCourseId#
@@ -278,10 +278,10 @@ getValuesByQueryNotWithPermission
   and find_in_set(t.teacher_open_course_merge_resources_info_id,#teacherOpenCourseMergeResourcesInfoIdPlural#)
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  and t.course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){
-  and find_in_set(t.course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
+  and find_in_set(t.teacher_open_course_merge_course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
   @}
   @if(!isEmpty(teacherOpenCourseId)){
   and t.teacher_open_course_id =#teacherOpenCourseId#
@@ -322,7 +322,7 @@ getExcelValues
   SELECT * FROM (
   (
   select
-  MAX(LENGTH(t.course_info_id)) course_info_id,
+  MAX(LENGTH(t.teacher_open_course_merge_course_info_id)) teacher_open_course_merge_course_info_id,
   MAX(LENGTH(t.teacher_open_course_id)) teacher_open_course_id,
   MAX(LENGTH(t.resources_info_name)) resources_info_name,
   MAX(LENGTH(t.resources_info_type)) resources_info_type,
@@ -336,10 +336,10 @@ getExcelValues
   and find_in_set(t.teacher_open_course_merge_resources_info_id,#teacherOpenCourseMergeResourcesInfoIdPlural#)
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  and t.course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){
-  and find_in_set(t.course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
+  and find_in_set(t.teacher_open_course_merge_course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
   @}
   @if(!isEmpty(teacherOpenCourseId)){
   and t.teacher_open_course_id =#teacherOpenCourseId#
@@ -372,7 +372,7 @@ getExcelValues
   UNION ALL
   (
   select
-  t.course_info_id ,
+  t.teacher_open_course_merge_course_info_id ,
   t.teacher_open_course_id ,
   t.resources_info_name ,
   t.resources_info_type ,
@@ -386,10 +386,10 @@ getExcelValues
   and find_in_set(t.teacher_open_course_merge_resources_info_id,#teacherOpenCourseMergeResourcesInfoIdPlural#)
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  and t.course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){
-  and find_in_set(t.course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
+  and find_in_set(t.teacher_open_course_merge_course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
   @}
   @if(!isEmpty(teacherOpenCourseId)){
   and t.teacher_open_course_id =#teacherOpenCourseId#

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

@@ -23,10 +23,10 @@ queryByCondition
   and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  and t.course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){
-  and find_in_set(t.course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
+  and find_in_set(t.teacher_open_course_merge_course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
   @}
   @if(!isEmpty(questionType)){
   and t.question_type =#questionType#
@@ -104,10 +104,10 @@ queryByConditionQuery
   and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  and t.course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){
-  and find_in_set(t.course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
+  and find_in_set(t.teacher_open_course_merge_course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
   @}
   @if(!isEmpty(questionType)){
   and t.question_type =#questionType#
@@ -195,9 +195,9 @@ updateGivenByIds
   @}
   @if(contain("teacherOpenCourseMergeCourseInfoId",_given)){
   @if(isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  course_info_id = null ,
+  teacher_open_course_merge_course_info_id = null ,
   @}else{
-  course_info_id = #teacherOpenCourseMergeCourseInfoId# ,
+  teacher_open_course_merge_course_info_id = #teacherOpenCourseMergeCourseInfoId# ,
   @}
   @}
   @if(contain("questionType",_given)){
@@ -311,7 +311,7 @@ getTeacherOpenCourseMergeResourcesQuestionValues
   and t.teacher_open_course_id =#teacherOpenCourseId#
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  and t.course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
   @}
   @if(!isEmpty(questionType)){
   and t.question_type =#questionType#
@@ -375,10 +375,10 @@ getValuesByQuery
   and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  and t.course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){
-  and find_in_set(t.course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
+  and find_in_set(t.teacher_open_course_merge_course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
   @}
   @if(!isEmpty(questionType)){
   and t.question_type =#questionType#
@@ -454,10 +454,10 @@ getValuesByQueryNotWithPermission
   and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  and t.course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){
-  and find_in_set(t.course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
+  and find_in_set(t.teacher_open_course_merge_course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
   @}
   @if(!isEmpty(questionType)){
   and t.question_type =#questionType#
@@ -523,7 +523,7 @@ getExcelValues
   (
   select
   MAX(LENGTH(t.teacher_open_course_id)) teacher_open_course_id,
-  MAX(LENGTH(t.course_info_id)) course_info_id,
+  MAX(LENGTH(t.teacher_open_course_merge_course_info_id)) teacher_open_course_merge_course_info_id,
   MAX(LENGTH(t.question_type)) question_type,
   MAX(LENGTH(t.question_score)) question_score,
   MAX(LENGTH(t.question_stem)) question_stem,
@@ -550,10 +550,10 @@ getExcelValues
   and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  and t.course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){
-  and find_in_set(t.course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
+  and find_in_set(t.teacher_open_course_merge_course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
   @}
   @if(!isEmpty(questionType)){
   and t.question_type =#questionType#
@@ -611,7 +611,7 @@ getExcelValues
   (
   select
   t.teacher_open_course_id ,
-  t.course_info_id ,
+  t.teacher_open_course_merge_course_info_id ,
   t.question_type ,
   t.question_score ,
   t.question_stem ,
@@ -638,10 +638,10 @@ getExcelValues
   and find_in_set(t.teacher_open_course_id,#teacherOpenCourseIdPlural#)
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoId)){
-  and t.course_info_id =#teacherOpenCourseMergeCourseInfoId#
+  and t.teacher_open_course_merge_course_info_id =#teacherOpenCourseMergeCourseInfoId#
   @}
   @if(!isEmpty(teacherOpenCourseMergeCourseInfoIdPlural)){
-  and find_in_set(t.course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
+  and find_in_set(t.teacher_open_course_merge_course_info_id,#teacherOpenCourseMergeCourseInfoIdPlural#)
   @}
   @if(!isEmpty(questionType)){
   and t.question_type =#questionType#