diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeSchoolClassQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeSchoolClassQuery.java index 9f7a2f74..1c8a1e4d 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeSchoolClassQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeSchoolClassQuery.java @@ -35,6 +35,8 @@ public class TeacherOpenCourseMergeSchoolClassQuery extends PageParam { private String orgIdPlural; private String userIdPlural; + private String teacherOpenCourseTitle; + private String teacherOpenCourseMergeSchoolClassJsonStr;//json格式 private String _given;//指定更新的特定字段,多个逗号隔开 @@ -142,4 +144,12 @@ public class TeacherOpenCourseMergeSchoolClassQuery extends PageParam { public void set_given(String _given) { this._given = _given; } + + public String getTeacherOpenCourseTitle() { + return teacherOpenCourseTitle; + } + + public void setTeacherOpenCourseTitle(String teacherOpenCourseTitle) { + this.teacherOpenCourseTitle = teacherOpenCourseTitle; + } } diff --git a/web/src/main/resources/application-prod.properties b/web/src/main/resources/application-prod.properties index 9f2c8e3d..54a8e5e0 100644 --- a/web/src/main/resources/application-prod.properties +++ b/web/src/main/resources/application-prod.properties @@ -66,4 +66,4 @@ dynamic.beetlsql.cs.dbStyle = org.beetl.sql.core.db.MySqlStyle dynamic.beetlsql.cs.dynamicConnectionSource = master,ds2 #\u6559\u5E08\u7AEF\u548C\u5B66\u751F\u7AEF\u7684\u767B\u5F55\u5730\u5740 -student.teacher.url = http://116.205.131.177:9090/ \ No newline at end of file +student.teacher.url = http://116.205.131.177:8080/ \ No newline at end of file diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeSchoolClass.md b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeSchoolClass.md index 6ce0a990..c36ec6f1 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeSchoolClass.md +++ b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeSchoolClass.md @@ -7,6 +7,7 @@ queryByCondition t.* @} from teacher_open_course_merge_school_class t + left join teacher_open_course ta on ta.teacher_open_course_id = t.teacher_open_course_id where 1=1 @//数据权限,该sql语句功能点,如果不考虑数据权限,可以删除此行 and #function("teacherOpenCourseMergeSchoolClass.query")# @@ -49,6 +50,9 @@ queryByCondition @if(!isEmpty(userIdPlural)){ and find_in_set(t.user_id,#userIdPlural#) @} + @if(!isEmpty(teacherOpenCourseTitle)){ + and ta.teacher_open_course_title like #'%'+teacherOpenCourseTitle+'%'# + @} queryByConditionQuery @@ -60,6 +64,7 @@ queryByConditionQuery t.* @} from teacher_open_course_merge_school_class t + left join teacher_open_course ta on ta.teacher_open_course_id = t.teacher_open_course_id where 1=1 @if(!isEmpty(teacherOpenCourseMergeSchoolClassId)){ and t.teacher_open_course_merge_school_class_id =#teacherOpenCourseMergeSchoolClassId# @@ -100,6 +105,9 @@ queryByConditionQuery @if(!isEmpty(userIdPlural)){ and find_in_set(t.user_id,#userIdPlural#) @} + @if(!isEmpty(teacherOpenCourseTitle)){ + and ta.teacher_open_course_title like #'%'+teacherOpenCourseTitle+'%'# + @}