diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesApplicationCourseQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesApplicationCourseQuery.java index ec874043..3fee4039 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesApplicationCourseQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/ResourcesApplicationCourseQuery.java @@ -14,6 +14,8 @@ public class ResourcesApplicationCourseQuery extends PageParam { private Long resourcesApplicationId; @Query(name = "课程配置ID", display = false) private Long courseInfoId; + @Query(name = "课程名称", display = true, fuzzy=true) + private String courseInfoName; private String courseInfoIds; @@ -52,4 +54,12 @@ public class ResourcesApplicationCourseQuery extends PageParam { public void setCourseInfoIds(String courseInfoIds) { this.courseInfoIds = courseInfoIds; } + + public String getCourseInfoName() { + return courseInfoName; + } + + public void setCourseInfoName(String courseInfoName) { + this.courseInfoName = courseInfoName; + } } diff --git a/web/src/main/resources/sql/jlw/resourcesApplicationCourse.md b/web/src/main/resources/sql/jlw/resourcesApplicationCourse.md index a7eea655..521e7291 100644 --- a/web/src/main/resources/sql/jlw/resourcesApplicationCourse.md +++ b/web/src/main/resources/sql/jlw/resourcesApplicationCourse.md @@ -4,9 +4,10 @@ queryByCondition select @pageTag(){ - t.* + t.* @} from resources_application_course t + left join course_info ta on t.course_info_id = ta.course_info_id where 1=1 @//数据权限,该sql语句功能点,如果不考虑数据权限,可以删除此行 and #function("resourcesApplicationCourse.query")# @@ -19,6 +20,9 @@ queryByCondition @if(!isEmpty(courseInfoId)){ and t.course_info_id =#courseInfoId# @} + @if(!isEmpty(courseInfoName)){ + and ta.course_info_name like #"%"+courseInfoName+"%"# + @} diff --git a/web/src/main/resources/templates/jlw/resourcesApplicationCourse/index.html b/web/src/main/resources/templates/jlw/resourcesApplicationCourse/index.html index bb98c77a..905e1004 100644 --- a/web/src/main/resources/templates/jlw/resourcesApplicationCourse/index.html +++ b/web/src/main/resources/templates/jlw/resourcesApplicationCourse/index.html @@ -8,13 +8,13 @@ } -
- -
- -
-
+ + + + + + +