Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Form.cshtml

@@ -3,33 +3,41 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item"  data-table="TeachingPlan" >
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">名称<font face="宋体">*</font></div>
         <input id="Name" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeachingPlan" >
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">年级</div>
-        <div id="Grade"  ></div>
+        <div id="Grade"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeachingPlan" >
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
+        <div class="lr-form-item-title">专业部</div>
+        <div id="Dept"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">专业</div>
-        <div id="Major"  ></div>
+        <div id="Major"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeachingPlan" >
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">学制</div>
-        <input id="SchoolSystem" type="text" class="form-control"  />
+        <input id="SchoolSystem" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
+        <div class="lr-form-item-title">学期课时量</div>
+        <input id="LessonTotal" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeachingPlan" >
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">总学分</div>
-        <input id="Credit" type="text" class="form-control"  />
+        <input id="Credit" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeachingPlan" >
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">启用</div>
         <div id="Enabled"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="TeachingPlan" >
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">备注</div>
-        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/TeachingPlan/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Form.js

@@ -23,6 +23,7 @@ var bootstrap = function ($, learun) {
                 maxHeight: 200
             });
 
+            $('#Dept').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno',text: 'deptname' });
             $('#Major').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno',text: 'majorname' });
             $('#Enabled').lrRadioCheckbox({
                 type: 'radio',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManage.cshtml

@@ -11,17 +11,25 @@
         <div class="lr-form-item-title">年级</div>
         <div id="Grade" readonly="readonly"></div>
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
+        <div class="lr-form-item-title">专业部</div>
+        <div id="Dept" readonly="readonly"></div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">专业</div>
         <div id="Major" readonly="readonly"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">学制</div>
-        <input id="SchoolSystem" type="text" class="form-control"  readonly="readonly"/>
+        <input id="SchoolSystem" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
+        <div class="lr-form-item-title">学期课时量</div>
+        <input id="LessonTotal" type="text" class="form-control"  readonly="readonly"/>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">总学分</div>
-        <input id="Credit" type="text" class="form-control"  readonly="readonly"/>
+        <input id="Credit" type="text" class="form-control" readonly="readonly" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">启用</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManage.js

@@ -48,6 +48,7 @@ var bootstrap = function ($, learun) {
                 maxHeight: 200
             });
 
+            $('#Dept').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#Major').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#Enabled').lrRadioCheckbox({
                 type: 'radio',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManageView.cshtml

@@ -11,17 +11,25 @@
         <div class="lr-form-item-title">年级</div>
         <div id="Grade" readonly="readonly"></div>
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
+        <div class="lr-form-item-title">专业部</div>
+        <div id="Dept" readonly="readonly"></div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">专业</div>
         <div id="Major" readonly="readonly"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">学制</div>
-        <input id="SchoolSystem" type="text" class="form-control"  readonly="readonly"/>
+        <input id="SchoolSystem" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
+        <div class="lr-form-item-title">学期课时量</div>
+        <input id="LessonTotal" type="text" class="form-control" readonly="readonly" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">总学分</div>
-        <input id="Credit" type="text" class="form-control"  readonly="readonly"/>
+        <input id="Credit" type="text" class="form-control" readonly="readonly" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
         <div class="lr-form-item-title">启用</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManageView.js

@@ -48,6 +48,7 @@ var bootstrap = function ($, learun) {
                 maxHeight: 200
             });
 
+            $('#Dept').lrDataSourceSelect({ code: 'CdDeptInfo', value: 'deptno', text: 'deptname' });
             $('#Major').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
             $('#Enabled').lrRadioCheckbox({
                 type: 'radio',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Index.js

@@ -26,8 +26,8 @@ var bootstrap = function ($, learun) {
                     id: 'form',
                     title: '新增',
                     url: top.$.rootUrl + '/EducationalAdministration/TeachingPlan/Form',
-                    width: 600,
-                    height: 400,
+                    width: 800,
+                    height: 600,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -41,8 +41,8 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '编辑',
                         url: top.$.rootUrl + '/EducationalAdministration/TeachingPlan/Form?keyValue=' + keyValue,
-                        width: 600,
-                        height: 400,
+                        width: 800,
+                        height: 600,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
@@ -74,6 +74,19 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "名称", name: "Name", width: 100, align: "left" },
                     { label: "年级", name: "Grade", width: 100, align: "left" },
+                    {
+                        label: "专业部", name: "Dept", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                key: value,
+                                keyId: 'deptno',
+                                callback: function (_data) {
+                                    callback(_data['deptname']);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "专业", name: "Major", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -88,6 +101,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "学制", name: "SchoolSystem", width: 100, align: "left" },
+                    { label: "学期课时量", name: "LessonTotal", width: 100, align: "left" },
                     { label: "总学分", name: "Credit", width: 100, align: "left" },
                     {
                         label: "状态", name: "Enabled", width: 100, align: "left",

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/IndexManage.js

@@ -30,8 +30,8 @@ var bootstrap = function ($, learun) {
                         url: top.$.rootUrl +
                             '/EducationalAdministration/TeachingPlan/FormManageView?keyValue=' +
                             keyValue,
-                        width: 600,
-                        height: 400,
+                        width: 800,
+                        height: 600,
                         btn: null,
                         callBack: function (id) {
                             //return top[id].acceptClick(refreshGirdData);
@@ -77,6 +77,19 @@ var bootstrap = function ($, learun) {
                 headData: [
                     { label: "名称", name: "Name", width: 100, align: "left" },
                     { label: "年级", name: "Grade", width: 100, align: "left" },
+                    {
+                        label: "专业部", name: "Dept", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                key: value,
+                                keyId: 'deptno',
+                                callback: function (_data) {
+                                    callback(_data['deptname']);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "专业", name: "Major", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -91,6 +104,7 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "学制", name: "SchoolSystem", width: 100, align: "left" },
+                    { label: "学期课时量", name: "LessonTotal", width: 100, align: "left" },
                     { label: "总学分", name: "Credit", width: 100, align: "left" },
                     { label: "公开课", name: "Zyknum", width: 100, align: "left" },
                     { label: "专业课", name: "Ggknum", width: 100, align: "left" },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TeachManagementController.cs

@@ -0,0 +1,127 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-16 17:42
+    /// 描 述：任教管理
+    /// </summary>
+    public class TeachManagementController : MvcControllerBase
+    {
+        private TeachManagementIBLL teachManagementIBLL = new TeachManagementBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = teachManagementIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TeachManagementData = teachManagementIBLL.GetTeachManagementEntity( keyValue );
+            var jsonData = new {
+                TeachManagement = TeachManagementData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teachManagementIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            TeachManagementEntity entity = strEntity.ToObject<TeachManagementEntity>();
+            var loginUserInfo = LoginUserInfo.Get();
+            if (string.IsNullOrEmpty(keyValue))
+            {
+                entity.CreateUserId = loginUserInfo.userId;
+                entity.CreateTime = DateTime.Now;
+            }
+            else
+            {
+                entity.ModifyUserId = loginUserInfo.userId;
+                entity.ModifyTime = DateTime.Now;
+            }
+            teachManagementIBLL.SaveEntity(keyValue,entity);
+            
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeachManagement/Form.cshtml

@@ -0,0 +1,31 @@
+@{
+    ViewBag.Title = "任教管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="TeachManagement" >
+        <div class="lr-form-item-title">教师<font face="宋体">*</font></div>
+        <div id="EmpNo" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeachManagement">
+        <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
+        <div id="AcademicYearNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeachManagement">
+        <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
+        <div id="Semester" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="TeachManagement" >
+        <div class="lr-form-item-title">任课班级<font face="宋体">*</font></div>
+        <div id="ClassNo" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="TeachManagement" >
+        <div class="lr-form-item-title">任教课程<font face="宋体">*</font></div>
+        <div id="LessonNo" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeachManagement">
+        <div class="lr-form-item-title">课时数<font face="宋体">*</font></div>
+        <input id="LessonTotal" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/TeachManagement/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeachManagement/Form.js

@@ -0,0 +1,69 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-08-16 17:42
+ * 描  述：任教管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo',value: 'empno',text: 'empname' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj',value: 'classno',text: 'classname' });
+            $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname' });
+            //学年
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "请选择学期",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
+                value: 'value',
+                text: 'text'
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/TeachManagement/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/TeachManagement/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeachManagement/Index.cshtml

@@ -0,0 +1,52 @@
+@{
+    ViewBag.Title = "任教管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">教师</div>
+                                    <div id="EmpNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学年</div>
+                                    <div id="AcademicYearNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">学期</div>
+                                    <div id="Semester"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">任课班级</div>
+                                    <div id="ClassNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">任教课程</div>
+                                    <div id="LessonNo"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/TeachManagement/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeachManagement/Index.js

@@ -0,0 +1,141 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-08-16 17:42
+ * 描  述：任教管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 300, 400);
+            $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo',value: 'empno',text: 'empname' });
+            $('#ClassNo').lrDataSourceSelect({ code: 'bjsj',value: 'classno',text: 'classname' });
+            $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname' });
+            //学年
+            $('#AcademicYearNo').lrselect({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "请选择学期",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
+                value: 'value',
+                text: 'text'
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/PersonnelManagement/TeachManagement/Form',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/PersonnelManagement/TeachManagement/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/TeachManagement/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/PersonnelManagement/TeachManagement/GetPageList',
+                headData: [
+                    { label: "教师姓名", name: "EmpNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
+                                 key: value,
+                                 keyId: 'empno',
+                                 callback: function (_data) {
+                                     callback(_data['empname']);
+                                 }
+                             });
+                        }},
+                    { label: "学年", name: "AcademicYearNo", width: 100, align: "left"},
+                    { label: "学期", name: "Semester", width: 100, align: "left"},
+                    { label: "任课班级", name: "ClassNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                 key: value,
+                                 keyId: 'classno',
+                                 callback: function (_data) {
+                                     callback(_data['classname']);
+                                 }
+                             });
+                        }},
+                    { label: "任教课程", name: "LessonNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                                 key: value,
+                                 keyId: 'lessonno',
+                                 callback: function (_data) {
+                                     callback(_data['lessonname']);
+                                 }
+                             });
+                        }},
+                    { label: "课时数", name: "LessonTotal", width: 100, align: "left"},
+                ],
+                mainId:'Id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -860,6 +860,7 @@
     <Compile Include="Areas\LogisticsManagement\Controllers\DormitoryReturnController.cs" />
     <Compile Include="Areas\LogisticsManagement\Controllers\Acc_DormitoryRuleController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuGraduateConditionController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\TeachManagementController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -6840,6 +6841,10 @@
     <Content Include="Areas\EducationalAdministration\Views\StuGraduateCondition\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuGraduateCondition\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuGraduateCondition\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\TeachManagement\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\TeachManagement\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\TeachManagement\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\TeachManagement\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElectivePre\" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj

@@ -617,6 +617,7 @@
     <Compile Include="LogisticsManagement\Acc_DormitoryReturnMap.cs" />
     <Compile Include="LogisticsManagement\Acc_DormitoryRuleMap.cs" />
     <Compile Include="EducationalAdministration\StuGraduateConditionMap.cs" />
+    <Compile Include="PersonnelManagement\TeachManagementMap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/TeachManagementMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-16 17:42
+    /// 描 述：任教管理
+    /// </summary>
+    public class TeachManagementMap : EntityTypeConfiguration<TeachManagementEntity>
+    {
+        public TeachManagementMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("TEACHMANAGEMENT");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanEntity.cs

@@ -65,6 +65,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("CREATETIME")]
         public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 专业部
+        /// </summary>
+        [Column("DEPT")]
+        public string Dept { get; set; }
+        /// <summary>
+        /// 学期课时量
+        /// </summary>
+        [Column("LESSONTOTAL")]
+        public string LessonTotal { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanService.cs

@@ -31,17 +31,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.Id,
-                t.Name,
-                t.Grade,
-                t.Major,
-                t.SchoolSystem,
-                t.Credit,
-                t.Enabled,
-                t.Remark
-                ");
+                strSql.Append("SELECT t.* ");
                 strSql.Append("  FROM TeachingPlan t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -1894,6 +1894,10 @@
     <Compile Include="EducationalAdministration\StuGraduateCondition\StuGraduateConditionService.cs" />
     <Compile Include="EducationalAdministration\StuGraduateCondition\StuGraduateConditionBLL.cs" />
     <Compile Include="EducationalAdministration\StuGraduateCondition\StuGraduateConditionIBLL.cs" />
+    <Compile Include="PersonnelManagement\TeachManagement\TeachManagementEntity.cs" />
+    <Compile Include="PersonnelManagement\TeachManagement\TeachManagementService.cs" />
+    <Compile Include="PersonnelManagement\TeachManagement\TeachManagementBLL.cs" />
+    <Compile Include="PersonnelManagement\TeachManagement\TeachManagementIBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeachManagement/TeachManagementBLL.cs

@@ -0,0 +1,125 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-16 17:42
+    /// 描 述：任教管理
+    /// </summary>
+    public class TeachManagementBLL : TeachManagementIBLL
+    {
+        private TeachManagementService teachManagementService = new TeachManagementService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<TeachManagementEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return teachManagementService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取TeachManagement表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public TeachManagementEntity GetTeachManagementEntity(string keyValue)
+        {
+            try
+            {
+                return teachManagementService.GetTeachManagementEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                teachManagementService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, TeachManagementEntity entity)
+        {
+            try
+            {
+                teachManagementService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeachManagement/TeachManagementEntity.cs

@@ -0,0 +1,95 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-16 17:42
+    /// 描 述：任教管理
+    /// </summary>
+    public class TeachManagementEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// EmpNo
+        /// </summary>
+        [Column("EMPNO")]
+        public string EmpNo { get; set; }
+        /// <summary>
+        /// AcademicYearNo
+        /// </summary>
+        [Column("ACADEMICYEARNO")]
+        public string AcademicYearNo { get; set; }
+        /// <summary>
+        /// Semester
+        /// </summary>
+        [Column("SEMESTER")]
+        public string Semester { get; set; }
+        /// <summary>
+        /// ClassNo
+        /// </summary>
+        [Column("CLASSNO")]
+        public string ClassNo { get; set; }
+        /// <summary>
+        /// LessonNo
+        /// </summary>
+        [Column("LESSONNO")]
+        public string LessonNo { get; set; }
+        /// <summary>
+        /// LessonTotal
+        /// </summary>
+        [Column("LESSONTOTAL")]
+        public decimal? LessonTotal { get; set; }
+        /// <summary>
+        /// CreateUserId
+        /// </summary>
+        [Column("CREATEUSERID")]
+        public string CreateUserId { get; set; }
+        /// <summary>
+        /// CreateTime
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// ModifyUserId
+        /// </summary>
+        [Column("MODIFYUSERID")]
+        public string ModifyUserId { get; set; }
+        /// <summary>
+        /// ModifyTime
+        /// </summary>
+        [Column("MODIFYTIME")]
+        public DateTime? ModifyTime { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.Id = Guid.NewGuid().ToString();
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.Id = keyValue;
+        }
+        #endregion
+        #region 扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeachManagement/TeachManagementIBLL.cs

@@ -0,0 +1,48 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-16 17:42
+    /// 描 述：任教管理
+    /// </summary>
+    public interface TeachManagementIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<TeachManagementEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取TeachManagement表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        TeachManagementEntity GetTeachManagementEntity(string keyValue);
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        void SaveEntity(string keyValue, TeachManagementEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeachManagement/TeachManagementService.cs

@@ -0,0 +1,166 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-16 17:42
+    /// 描 述：任教管理
+    /// </summary>
+    public class TeachManagementService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<TeachManagementEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.*");
+                strSql.Append("  FROM TeachManagement t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["EmpNo"].IsEmpty())
+                {
+                    dp.Add("EmpNo",queryParam["EmpNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EmpNo = @EmpNo ");
+                }
+                if (!queryParam["AcademicYearNo"].IsEmpty())
+                {
+                    dp.Add("AcademicYearNo", "%" + queryParam["AcademicYearNo"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.AcademicYearNo Like @AcademicYearNo ");
+                }
+                if (!queryParam["Semester"].IsEmpty())
+                {
+                    dp.Add("Semester", "%" + queryParam["Semester"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Semester Like @Semester ");
+                }
+                if (!queryParam["ClassNo"].IsEmpty())
+                {
+                    dp.Add("ClassNo",queryParam["ClassNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ClassNo = @ClassNo ");
+                }
+                if (!queryParam["LessonNo"].IsEmpty())
+                {
+                    dp.Add("LessonNo",queryParam["LessonNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.LessonNo = @LessonNo ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<TeachManagementEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取TeachManagement表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public TeachManagementEntity GetTeachManagementEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<TeachManagementEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<TeachManagementEntity>(t=>t.Id == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        public void SaveEntity(string keyValue, TeachManagementEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}