From ea63622c375e5b8ca57f4351fd717e3c31d6e0c9 Mon Sep 17 00:00:00 2001 From: yangdj <18302547071@163> Date: Sat, 29 Oct 2022 14:25:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=98=E6=A1=A3=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/plugins/login/img/123456.jpg | Bin 0 -> 53462 bytes .../templates/common/tag/searchForm.tag.html | 125 +----------------- ...erOpenCourseMergeCourseInfoController.java | 7 + ...TeacherOpenCourseMergeCourseInfoQuery.java | 4 +- ...erOpenCourseScheduleSessionClassQuery.java | 2 +- .../wdcd.html | 11 ++ 6 files changed, 24 insertions(+), 125 deletions(-) create mode 100644 admin-core/src/main/resources/static/plugins/login/img/123456.jpg create mode 100644 web/src/main/resources/templates/jlw/teacherOpenCourseMergeCourseInfo/wdcd.html diff --git a/admin-core/src/main/resources/static/plugins/login/img/123456.jpg b/admin-core/src/main/resources/static/plugins/login/img/123456.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e26b69f650aa8d5fdd1ec01b907b628786e32154 GIT binary patch literal 53462 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 PT%Xl7I-RR+efQr0z-9#S literal 0 HcmV?d00001 diff --git a/admin-core/src/main/resources/templates/common/tag/searchForm.tag.html b/admin-core/src/main/resources/templates/common/tag/searchForm.tag.html index c75998a7..ef61eb6a 100644 --- a/admin-core/src/main/resources/templates/common/tag/searchForm.tag.html +++ b/admin-core/src/main/resources/templates/common/tag/searchForm.tag.html @@ -69,130 +69,11 @@ }/*结束循环*/ --> - - - - -
-
- -
-
- - -
- -
- -
-
- + +
+
-
- - -
-
- -
-
- - - -
- -
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java index 6d2762ca..d16a8a66 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java @@ -104,6 +104,13 @@ public class TeacherOpenCourseMergeCourseInfoController{ return view; } + @GetMapping(MODEL + "/wdcd.do") + @Function("teacherOpenCourseMergeCourseInfo.wfcdindex") + public ModelAndView wdcd() { + ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseMergeCourseInfo/wdcd.html") ; + return view; + } + @GetMapping(MODEL + "/edit.do") @Function("teacherOpenCourseMergeCourseInfo.edit") public ModelAndView edit(Long teacherOpenCourseMergeCourseInfoId) { diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java index 970cc367..0cd28feb 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeCourseInfoQuery.java @@ -14,13 +14,13 @@ public class TeacherOpenCourseMergeCourseInfoQuery extends PageParam { @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) @Query(name = "ID", display = false) private Long teacherOpenCourseMergeCourseInfoId; - @Query(name = "开课ID", display = true,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") + @Query(name = "开课名称", display = true,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") private Long teacherOpenCourseId; @Query(name = "名称(课程名 或 章名 或 节名)", display = false) private String courseInfoName; @Query(name = "课程缩略图", display = false) private String courseInfoThumbnail; - @Query(name = "课程标签ID", display = true,type=Query.TYPE_DICT,dict="course_label.course_label_name.course_label_status=1") + @Query(name = "课程标签", display = true,type=Query.TYPE_DICT,dict="course_label.course_label_name.course_label_status=1") private Long courseLabelId; @Query(name = "课程学习人数基数", display = false) private Integer courseInfoBasicsCount; diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionClassQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionClassQuery.java index ba81f269..3528209e 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionClassQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionClassQuery.java @@ -16,7 +16,7 @@ public class TeacherOpenCourseScheduleSessionClassQuery extends PageParam { @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) @Query(name = "课程开课-排课位置ID", display = false) private Long teacherOpenCourseScheduleSessionClassId; - @Query(name = "排课位置名称", display = true) + @Query(name = "位置名称", display = true) private String teacherOpenCourseScheduleSessionClassName; // 默认 0 为顶级ID diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseMergeCourseInfo/wdcd.html b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeCourseInfo/wdcd.html new file mode 100644 index 00000000..d8607168 --- /dev/null +++ b/web/src/main/resources/templates/jlw/teacherOpenCourseMergeCourseInfo/wdcd.html @@ -0,0 +1,11 @@ + + + +