实训归属课程

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

@@ -60,7 +60,7 @@ queryByConditionMergeOpenCourseHandsOn
   SELECT
   @pageTag(){
   t.teacher_open_course_id,
-  IFNULL(zb.teacher_open_course_title, '系统内置课程') as teacher_open_course_title,
+  t.course_info_name,
   t.`hands_on_id`,
   t.`course_child_node`,
   t.course_child_node_name,
@@ -83,8 +83,8 @@ queryByConditionMergeOpenCourseHandsOn
   c.`add_time`,
   c.`org_id`,
   c.`user_id`,
-  a.course_info_id as system_course_info_id,
-  (select course_info_name from course_info zc where zc.course_info_id = c.course_child_node and zc.course_info_status = 1 limit 1) as course_child_node_name,
+  a.course_info_name as course_child_node_name,
+  (select course_info_name from course_info zc where zc.course_info_id = c.course_info_id and zc.course_info_status = 1 limit 1) as course_info_name,
   'ADMIN_ADD' AS data_type,
   c.hands_on_status
   FROM
@@ -105,8 +105,8 @@ queryByConditionMergeOpenCourseHandsOn
   c.`add_time`,
   c.`org_id`,
   c.`user_id`,
-  ifnull(b.course_info_name, e.teacher_open_course_title) AS course_info_name,
   d.course_info_name AS course_child_node_name,
+  ifnull(b.course_info_name, e.teacher_open_course_title) AS course_info_name,
   'FACULTY_ADD' AS data_type,
   c.hands_on_status
   FROM
@@ -116,7 +116,6 @@ queryByConditionMergeOpenCourseHandsOn
   LEFT JOIN teacher_open_course_merge_course_info d ON c.course_child_node = d.teacher_open_course_merge_course_info_id
   ) t
   LEFT JOIN core_org za ON za.id = t.org_id
-  LEFT JOIN teacher_open_course zb ON zb.teacher_open_course_id = t.teacher_open_course_id
 
   WHERE 1 = 1
   @if(!isEmpty(handsOnId)){

web/src/main/resources/static/js/jlw/handsOn/index.js

@@ -49,7 +49,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
                         hideField: false,
                         hide: $.isEmpty(sx_['handsOnName']) ? false : sx_['handsOnName'],
                     }, {
-                        field: 'teacherOpenCourseTitle',
+                        field: 'courseInfoName',
                         title: '归属课程', align: "center",
                         // templet:function (d) {
                         //     var htm;