开课管理

web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseQuery.java

@@ -21,26 +21,27 @@ public class TeacherOpenCourseQuery extends PageParam {
     @Query(name = "开课名称", display = true)
     private String teacherOpenCourseTitle;
 
-    @Query(name = "课程编码", display = true)
+    @Query(name = "课程编码", display = false)
     private String teacherOpenCourseCode;
     //    @Query(name = "封面列表（JSON格式: {封面URL：is默认封面}）", display = false)
     @Query(name = "封面列表", display = false)
     private String teacherOpenCourseCover;
+    @Query(name = "上课教师", display = true, type = Query.TYPE_DICT, dict = "teacher.teacher_name.teacher_status=1")
+    private Long teacherId;
     //    @Query(name = "开课状态（1启用 2禁用）", display = true,type=Query.TYPE_DICT,dict=GLOBAL_OPEN_STATUS)
     @Query(name = "开课状态", display = true, type = Query.TYPE_DICT, dict = GLOBAL_OPEN_STATUS)
     private Integer teacherOpenCourseStatus;
 
     @Query(name = "开课简介", display = false)
     private String teacherOpenCourseSummary;
-    @Query(name = "教师", display = true, type=Query.TYPE_DICT, dict = "teacher.teacher_name.teacher_status=1")
-    private Long teacherId;
+
 
     // 开课授权码（外表）
-    @Query(name = "开课授权码", display = true)
+    @Query(name = "开课授权码", display = false)
     private String teacherOpenCourseMergeAuthCode;
-    @Query(name = "开课时间", display = true)
+    @Query(name = "开课时间", display = false)
     private Date startTime;
-    @Query(name = "结课时间", display = true)
+    @Query(name = "结课时间", display = false)
     private Date endTime;
     @Query(name = "组织ID", display = false)
     private Long orgId;
@@ -70,60 +71,79 @@ public class TeacherOpenCourseQuery extends PageParam {
     public Long getTeacherOpenCourseId() {
         return teacherOpenCourseId;
     }
+
     public void setTeacherOpenCourseId(Long teacherOpenCourseId) {
         this.teacherOpenCourseId = teacherOpenCourseId;
     }
+
     public String getTeacherOpenCourseTitle() {
         return teacherOpenCourseTitle;
     }
+
     public void setTeacherOpenCourseTitle(String teacherOpenCourseTitle) {
         this.teacherOpenCourseTitle = teacherOpenCourseTitle;
     }
+
     public String getTeacherOpenCourseCode() {
         return teacherOpenCourseCode;
     }
+
     public void setTeacherOpenCourseCode(String teacherOpenCourseCode) {
         this.teacherOpenCourseCode = teacherOpenCourseCode;
     }
+
     public String getTeacherOpenCourseCover() {
         return teacherOpenCourseCover;
     }
+
     public void setTeacherOpenCourseCover(String teacherOpenCourseCover) {
         this.teacherOpenCourseCover = teacherOpenCourseCover;
     }
+
     public Integer getTeacherOpenCourseStatus() {
         return teacherOpenCourseStatus;
     }
+
     public void setTeacherOpenCourseStatus(Integer teacherOpenCourseStatus) {
         this.teacherOpenCourseStatus = teacherOpenCourseStatus;
     }
+
     public Date getStartTime() {
         return startTime;
     }
+
     public void setStartTime(Date startTime) {
         this.startTime = startTime;
     }
+
     public Date getEndTime() {
         return endTime;
     }
+
     public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
+
     public Long getOrgId() {
         return orgId;
     }
+
     public void setOrgId(Long orgId) {
         this.orgId = orgId;
     }
+
     public Long getUserId() {
         return userId;
     }
+
     public void setUserId(Long userId) {
         this.userId = userId;
     }
+
     public Date getCreateTime() {
         return createTime;
     }
+
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
@@ -148,36 +168,47 @@ public class TeacherOpenCourseQuery extends PageParam {
     public String getTeacherOpenCourseIdPlural() {
         return teacherOpenCourseIdPlural;
     }
+
     public void setTeacherOpenCourseIdPlural(String teacherOpenCourseIdPlural) {
         this.teacherOpenCourseIdPlural = teacherOpenCourseIdPlural;
     }
+
     public String getTeacherOpenCourseStatusPlural() {
         return teacherOpenCourseStatusPlural;
     }
+
     public void setTeacherOpenCourseStatusPlural(String teacherOpenCourseStatusPlural) {
         this.teacherOpenCourseStatusPlural = teacherOpenCourseStatusPlural;
     }
+
     public String getOrgIdPlural() {
         return orgIdPlural;
     }
+
     public void setOrgIdPlural(String orgIdPlural) {
         this.orgIdPlural = orgIdPlural;
     }
+
     public String getUserIdPlural() {
         return userIdPlural;
     }
+
     public void setUserIdPlural(String userIdPlural) {
         this.userIdPlural = userIdPlural;
     }
+
     public String getTeacherOpenCourseJsonStr() {
         return teacherOpenCourseJsonStr;
     }
+
     public void setTeacherOpenCourseJsonStr(String teacherOpenCourseJsonStr) {
         this.teacherOpenCourseJsonStr = teacherOpenCourseJsonStr;
     }
+
     public String get_given() {
         return _given;
     }
+
     public void set_given(String _given) {
         this._given = _given;
     }

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

@@ -16,7 +16,11 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
         },
         initTable: function () {
             var sx_ = localStorage.getItem("teacherOpenCourseTable_field_" + Common.userInfoId); //筛选值显示、隐藏缓存
-            if($.isEmpty(sx_)){sx_ = {};}else {sx_ = JSON.parse(sx_);}
+            if ($.isEmpty(sx_)) {
+                sx_ = {};
+            } else {
+                sx_ = JSON.parse(sx_);
+            }
             teacherOpenCourseTable = table.render({
                 elem: '#teacherOpenCourseTable',
                 height: Lib.getTableHeight(1),
@@ -24,21 +28,20 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                 method: 'post',
                 url: Common.ctxPath + '/jlw/teacherOpenCourse/list.json' // 数据接口
                 , page: Lib.tablePage // 开启分页
-                ,toolbar: '#toolbar_teacherOpenCourse' //自定义头部左侧工具栏
-                ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏
+                /*,toolbar: '#toolbar_teacherOpenCourse' //自定义头部左侧工具栏
+                ,defaultToolbar: ['filter', 'print', 'exports'] //头部右侧工具栏*/
                 , limit: 10,
                 cols: [[ // 表头
-                    {
+                    /*{
                         type : 'checkbox',
 
-                    },
+                    },*/
                     {
                         field: 'teacherOpenCourseId',
                         title: '课程开课ID',
                         align: "center",
                         hideField: false,
-                    hide:$.isEmpty(sx_['teacherOpenCourseId'])?false:sx_['teacherOpenCourseId'],
-
+                        hide: true,
                         width: 60,
                     },
                     {
@@ -49,18 +52,36 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                         hide: $.isEmpty(sx_['teacherOpenCourseTitle']) ? false : sx_['teacherOpenCourseTitle'],
                     },
                     {
-                    field : 'teacherOpenCourseCode', 
-                    title : '课程编码',
+                        field: 'teacherIdText',
+                        title: '上课教师',
                         align: "center",
                         hideField: false,
-                    hide:$.isEmpty(sx_['teacherOpenCourseCode'])?false:sx_['teacherOpenCourseCode'],
+                        hide: $.isEmpty(sx_['teacherIdText']) ? false : sx_['teacherIdText'],
                     },
                     {
-                    field : 'teacherIdText',
-                    title : '教师名称',
+                        field: 'schoolClassText',
+                        title: '上课班级',
+                        align: "center",
+                    },
+                    {
+                        field: 'time',
+                        title: '课程学时',
                         align: "center",
                         hideField: false,
-                    hide:$.isEmpty(sx_['teacherIdText'])?false:sx_['teacherIdText'],
+                        hide: $.isEmpty(sx_['endTime']) ? false : sx_['endTime'],
+                        templet: function (d) {
+                            var v = Common.GetDateDiff(d.startTime, d.endTime, 'hour');
+
+                            console.log(Common.getDate(d.startTime), Common.getDate(d.endTime))
+                            return v + "学时";
+                        }
+                    },
+                    {
+                        field: 'teacherOpenCourseCode',
+                        title: '课程编码',
+                        align: "center",
+                        hideField: false,
+                        hide: true,
                     },
                     {
                         field: 'teacherOpenCourseCover',
@@ -68,37 +89,49 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                         title: '封面列表',
                         align: "center",
                         hideField: false,
-                    hide:$.isEmpty(sx_['teacherOpenCourseCover'])?false:sx_['teacherOpenCourseCover'],
+                        hide: true,
                     },
                     {
                         field: 'teacherOpenCourseSummary',
                         title: '简介',
                         align: "center",
                         hideField: false,
-                    hide:$.isEmpty(sx_['teacherOpenCourseSummary'])?false:sx_['teacherOpenCourseSummary'],
+                        hide: true,
                     },
                     {
-                    field : 'teacherOpenCourseStatusText', //数据字典类型为 global_open_status
-                    // title : '开课状态（1启用 2禁用）',
-                    title : '开课状态',
+                        field: 'teacherOpenCourseMergeTeacherAuthCode',
+                        title: '开课授权码',
                         align: "center",
                         hideField: false,
-                    hide:$.isEmpty(sx_['teacherOpenCourseStatusText'])?false:sx_['teacherOpenCourseStatusText'],
+                        hide: $.isEmpty(sx_['teacherOpenCourseMergeTeacherAuthCode']) ? false : sx_['teacherOpenCourseMergeTeacherAuthCode'],
                     },
                     {
-                    field : 'startTime', 
-                    title : '开课时间',
+                        field: 'createTime',
+                        title: '创建时间',
                         align: "center",
                         hideField: false,
-                    hide:$.isEmpty(sx_['startTime'])?false:sx_['startTime'],
+                        hide: $.isEmpty(sx_['createTime']) ? false : sx_['createTime'],
                     },
                     {
-                    field : 'endTime', 
-                    title : '结课时间',
+                        field: 'teacherOpenCourseStatusText', //数据字典类型为 global_open_status
+                        // title : '开课状态（1启用 2禁用）',
+                        title: '开课状态',
                         align: "center",
                         hideField: false,
-                    hide:$.isEmpty(sx_['endTime'])?false:sx_['endTime'],
-                },
+                        hide: $.isEmpty(sx_['teacherOpenCourseStatusText']) ? false : sx_['teacherOpenCourseStatusText'],
+                        templet: function (d) {
+                            var css = d.teacherOpenCourseStatus == 2 ? "textType2" : 'textType';
+                            return '<span class="' + css + '">' + d.teacherOpenCourseStatusText + '</span>';
+                        }
+                    }, {
+                        field: 'operation_', title: '操作', align: "center", width: "200", templet: function (d) {
+                            var htm = '<a class="layui-table-link" lay-event="edit">去排课</a>';
+                            htm += '<a class="layui-table-link" lay-event="qiyong">启用</a>';
+                            htm += '<a class="layui-table-link" lay-event="jinyong">禁用</a>';
+                            htm += '<a class="layui-table-link" lay-event="del">删除</a>';
+                            return htm;
+                        }
+                    }
                     // {
                     //     field : 'orgId',
                     //     title : '组织ID',
@@ -113,28 +146,6 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     //     hideField :false,
                     //     hide:$.isEmpty(sx_['userId'])?false:sx_['userId'],
                     // },
-                    {
-                        field : 'teacherOpenCourseMergeTeacherAuthCode',
-                        title : '开课授权码',
-                        align:"center",
-                        hideField :false,
-                        hide:$.isEmpty(sx_['teacherOpenCourseMergeTeacherAuthCode'])?false:sx_['teacherOpenCourseMergeTeacherAuthCode'],
-                    },
-                {
-                    field : 'createTime', 
-                    title : '创建时间',
-                    align:"center",
-                    hideField :false,
-                    hide:$.isEmpty(sx_['createTime'])?false:sx_['createTime'],
-                }
-                ,{
-                    field : 'operation_',title : '操作',align:"center", templet: function (d) {
-                        var htm = '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit">编辑</button>';
-                        htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</button>';
-                        return htm;
-                    }
-                }
-
                 ]]
 
             });

web/src/main/resources/templates/jlw/teacherOpenCourse/index.html

@@ -1,4 +1,21 @@
 <!--#layout("/common/layout.html",{"jsBase":"/js/jlw/teacherOpenCourse/"}){ -->
+<style>
+    .layui-table a {
+        margin-right: 10px;
+    }
+    .textType {
+        border: 1px solid #0f9cfd;
+        color: #0f9cfd;
+        border-radius: 5px;
+        padding: 3px
+    }
+    .textType2 {
+        border: 1px solid #919191;
+        color: #919191;
+        border-radius: 5px;
+        padding: 3px
+    }
+</style>
 <layui:searchForm formId="searchForm" searchList="" condition="${search}">
 </layui:searchForm>
 <table id="teacherOpenCourseTable" lay-filter="teacherOpenCourseTable"></table>
@@ -7,15 +24,10 @@
 <script type="text/html" id="toolbar_teacherOpenCourse">
     <div class="layui-btn-container">
         <div class="layui-btn-group" >
-            <!--# if(core.searchIsShow(search)) {-->
-            <layui:accessButton function="teacherOpenCourse.query"  id="searchFormSearch" action="search"><i class="layui-icon">&#xe615;</i>搜索</layui:accessButton>
-            <!--# }-->
-            <layui:accessButton function="teacherOpenCourse.add"  action="add">添加</layui:accessButton>
+            <layui:accessButton function="teacherOpenCourse.add"  action="add"><i class="layui-icon">&#xe61f;</i>添加</layui:accessButton>
             <layui:accessButton function="teacherOpenCourse.edit"  action="edit">修改</layui:accessButton>
             <layui:accessButton function="teacherOpenCourse.del"  action="del">删除</layui:accessButton>
-            <!--#            if(!isEmpty(search)) {-->
-            <layui:accessButton function="teacherOpenCourse.query"  action="refresh"><i class="layui-icon">&#xe669;</i>刷新</layui:accessButton>
-            <!--#            }-->
+
         </div>
     </div>
 </script>