diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TeachingPlanController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TeachingPlanController.cs
new file mode 100644
index 000000000..3665ef9ee
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TeachingPlanController.cs	
@@ -0,0 +1,178 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-10-14 10:09
+    /// 描 述：教学计划
+    /// </summary>
+    public class TeachingPlanController : MvcControllerBase
+    {
+        private TeachingPlanIBLL teachingPlanIBLL = new TeachingPlanBLL();
+        private TeachingPlanItemIBLL teachingPlanItemIBLL = new TeachingPlanItemBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 教学计划和课程设置--列表
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexManage()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 教学计划和课程设置--编辑
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormManage()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 教学计划和课程设置--查看
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormManageView()
+        {
+            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 = teachingPlanIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageListForManage(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = teachingPlanIBLL.GetPageListForManage(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 TeachingPlanData = teachingPlanIBLL.GetTeachingPlanEntity(keyValue);
+            var TeachingPlanItemData = teachingPlanItemIBLL.GetListByPlanId(TeachingPlanData.Id);
+
+            var jsonData = new
+            {
+                TeachingPlan = TeachingPlanData,
+                TeachingPlanItem = TeachingPlanItemData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teachingPlanIBLL.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,string TeachingPlanItemList)
+        {
+            TeachingPlanEntity entity = strEntity.ToObject<TeachingPlanEntity>();
+            List<TeachingPlanItemEntity> teachingPlanItemList = new List<TeachingPlanItemEntity>();
+            if (!string.IsNullOrEmpty(TeachingPlanItemList))
+            {
+                teachingPlanItemList = TeachingPlanItemList.ToObject<List<TeachingPlanItemEntity>>();
+            }
+           
+            teachingPlanIBLL.SaveEntity(keyValue, entity, teachingPlanItemList);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TeachingPlanItemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TeachingPlanItemController.cs
new file mode 100644
index 000000000..6f68f6951
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TeachingPlanItemController.cs	
@@ -0,0 +1,117 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-10-15 10:08
+    /// 描 述：教学计划--课程子表
+    /// </summary>
+    public class TeachingPlanItemController : MvcControllerBase
+    {
+        private TeachingPlanItemIBLL teachingPlanItemIBLL = new TeachingPlanItemBLL();
+
+        #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 = teachingPlanItemIBLL.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 TeachingPlanItemData = teachingPlanItemIBLL.GetTeachingPlanItemEntity( keyValue );
+            var jsonData = new {
+                TeachingPlanItem = TeachingPlanItemData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            teachingPlanItemIBLL.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)
+        {
+            TeachingPlanItemEntity entity = strEntity.ToObject<TeachingPlanItemEntity>();
+            teachingPlanItemIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Form.cshtml
new file mode 100644
index 000000000..209487325
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Form.cshtml	
@@ -0,0 +1,35 @@
+@{
+    ViewBag.Title = "教学计划";
+    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="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="lr-form-item-title">年级</div>
+        <div id="Grade"  ></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>
+    <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"  />
+    </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"  />
+    </div>
+    <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="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TeachingPlan/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Form.js
new file mode 100644
index 000000000..55eccfa94
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Form.js	
@@ -0,0 +1,63 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-10-14 10:09
+ * 描  述：教学计划
+ */
+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 () {
+            //年级
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: 'value',
+                text: 'text',
+                maxHeight: 200
+            });
+
+            $('#Major').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno',text: 'majorname' });
+            $('#Enabled').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoBit',
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/TeachingPlan/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 + '/EducationalAdministration/TeachingPlan/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManage.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManage.cshtml
new file mode 100644
index 000000000..f01bfbe15
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManage.cshtml	
@@ -0,0 +1,42 @@
+@{
+    ViewBag.Title = "教学计划";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 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" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
+        <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="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"/>
+    </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"/>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
+        <div class="lr-form-item-title">启用</div>
+        <div id="Enabled" readonly="readonly"></div>
+    </div>
+    <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;" readonly="readonly"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">明细操作</div>
+        <input id="detailedit" type="button" class="btn btn-warning" value="编辑明细" />
+    </div>
+    <div class="col-xs-12 lr-form-item lr-form-item-grid">
+        <div id="TeachingPlanItem"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TeachingPlan/FormManage.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManage.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManage.js
new file mode 100644
index 000000000..4ef2c76d7
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManage.js	
@@ -0,0 +1,165 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-10-14 10:09
+ * 描  述：教学计划
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var refreshGirdData;
+var selectedRow;
+var tempdatra = new Array();
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            $("#detailedit").on('click', function () {
+                var keyValue = $('#TeachingPlanItem').jfGridValue('Id');
+                selectedRow = $('#TeachingPlanItem').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form_TeachingPlanItem',
+                        title: '编辑明细',
+                        url: top.$.rootUrl + '/EducationalAdministration/TeachingPlanItem/Form?keyValue=' + keyValue,
+                        width: 650,
+                        height: 430,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            //年级
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: 'value',
+                text: 'text',
+                maxHeight: 200
+            });
+
+            $('#Major').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
+            $('#Enabled').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoBit',
+            });
+            $('#TeachingPlanItem').jfGrid({
+                headData: [
+                    {
+                        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: 'LessonTime', width: 100, align: 'left'
+                    },
+                    {
+                        label: '执行学期', name: 'Semester', width: 100, align: 'left'
+                    },
+                    {
+                        label: '周节次', name: 'WeeklyFestival', width: 100, align: 'left'
+                    },
+                    {
+                        label: '开课起始周', name: 'WeeklyStart', width: 150, align: 'left'
+                    },
+                    {
+                        label: '开课结束周', name: 'WeeklyEnd', width: 150, align: 'left'
+                    },
+                ],
+                height: 270,
+                mainId: 'Id'
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/TeachingPlan/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                            tempdatra = data[id];
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    refreshGirdData = function (temprow) {
+        
+        var ifnewrow = true;
+        $.each(tempdatra, function (key, val) {
+            if (tempdatra[key].Id === temprow.Id) {
+                tempdatra[key] = temprow;
+                ifnewrow = false;
+            }
+        });
+        if (ifnewrow) {
+            tempdatra.push(temprow);
+        }
+        $('#TeachingPlanItem').jfGridSet('refreshdata', tempdatra);
+
+    };
+
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('.lr-form-wrap').lrValidform()) {
+            return false;
+        }
+        //var datas = $('#TeachingPlanItem').jfGridGet('rowdatas');
+        //if (datas == null || datas.length == 0) {
+        //    learun.alert.warning("申请未包含明细！请先新增明细！");
+        //    return false;
+        //}
+        return true;
+    };
+    //// 保存数据
+    //acceptClick = function (callBack) {
+    //    if (!$('body').lrValidform()) {
+    //        return false;
+    //    }
+    //    var postData = {
+    //        strEntity: JSON.stringify($('body').lrGetFormData())
+    //    };
+    //    $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/TeachingPlan/SaveForm?keyValue=' + keyValue, postData, function (res) {
+    //        // 保存成功后才回调
+    //        if (!!callBack) {
+    //            callBack();
+    //        }
+    //    });
+    //};
+    // 保存数据
+    save = function (callBack, i) {
+        var postData = {};
+        var formData = $('[data-table="TeachingPlan"]').lrGetFormData();
+        
+        postData.strEntity = JSON.stringify(formData);
+        postData.TeachingPlanItemList = JSON.stringify($('#TeachingPlanItem').jfGridGet('rowdatas'));
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/TeachingPlan/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack(res, formData, i);
+            }
+        });
+    };
+    page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManageView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManageView.cshtml
new file mode 100644
index 000000000..c6a2c9082
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManageView.cshtml	
@@ -0,0 +1,38 @@
+@{
+    ViewBag.Title = "教学计划";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 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" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
+        <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="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"/>
+    </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"/>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="TeachingPlan">
+        <div class="lr-form-item-title">启用</div>
+        <div id="Enabled" readonly="readonly"></div>
+    </div>
+    <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;" readonly="readonly"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item lr-form-item-grid">
+        <div id="TeachingPlanItem"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TeachingPlan/FormManageView.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManageView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManageView.js
new file mode 100644
index 000000000..4ef2c76d7
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/FormManageView.js	
@@ -0,0 +1,165 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-10-14 10:09
+ * 描  述：教学计划
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var refreshGirdData;
+var selectedRow;
+var tempdatra = new Array();
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            $("#detailedit").on('click', function () {
+                var keyValue = $('#TeachingPlanItem').jfGridValue('Id');
+                selectedRow = $('#TeachingPlanItem').jfGridGet('rowdata');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form_TeachingPlanItem',
+                        title: '编辑明细',
+                        url: top.$.rootUrl + '/EducationalAdministration/TeachingPlanItem/Form?keyValue=' + keyValue,
+                        width: 650,
+                        height: 430,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            //年级
+            $('#Grade').lrselect({
+                url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear',
+                value: 'value',
+                text: 'text',
+                maxHeight: 200
+            });
+
+            $('#Major').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
+            $('#Enabled').lrRadioCheckbox({
+                type: 'radio',
+                code: 'YesOrNoBit',
+            });
+            $('#TeachingPlanItem').jfGrid({
+                headData: [
+                    {
+                        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: 'LessonTime', width: 100, align: 'left'
+                    },
+                    {
+                        label: '执行学期', name: 'Semester', width: 100, align: 'left'
+                    },
+                    {
+                        label: '周节次', name: 'WeeklyFestival', width: 100, align: 'left'
+                    },
+                    {
+                        label: '开课起始周', name: 'WeeklyStart', width: 150, align: 'left'
+                    },
+                    {
+                        label: '开课结束周', name: 'WeeklyEnd', width: 150, align: 'left'
+                    },
+                ],
+                height: 270,
+                mainId: 'Id'
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/TeachingPlan/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                            tempdatra = data[id];
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    refreshGirdData = function (temprow) {
+        
+        var ifnewrow = true;
+        $.each(tempdatra, function (key, val) {
+            if (tempdatra[key].Id === temprow.Id) {
+                tempdatra[key] = temprow;
+                ifnewrow = false;
+            }
+        });
+        if (ifnewrow) {
+            tempdatra.push(temprow);
+        }
+        $('#TeachingPlanItem').jfGridSet('refreshdata', tempdatra);
+
+    };
+
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('.lr-form-wrap').lrValidform()) {
+            return false;
+        }
+        //var datas = $('#TeachingPlanItem').jfGridGet('rowdatas');
+        //if (datas == null || datas.length == 0) {
+        //    learun.alert.warning("申请未包含明细！请先新增明细！");
+        //    return false;
+        //}
+        return true;
+    };
+    //// 保存数据
+    //acceptClick = function (callBack) {
+    //    if (!$('body').lrValidform()) {
+    //        return false;
+    //    }
+    //    var postData = {
+    //        strEntity: JSON.stringify($('body').lrGetFormData())
+    //    };
+    //    $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/TeachingPlan/SaveForm?keyValue=' + keyValue, postData, function (res) {
+    //        // 保存成功后才回调
+    //        if (!!callBack) {
+    //            callBack();
+    //        }
+    //    });
+    //};
+    // 保存数据
+    save = function (callBack, i) {
+        var postData = {};
+        var formData = $('[data-table="TeachingPlan"]').lrGetFormData();
+        
+        postData.strEntity = JSON.stringify(formData);
+        postData.TeachingPlanItemList = JSON.stringify($('#TeachingPlanItem').jfGridGet('rowdatas'));
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/TeachingPlan/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack(res, formData, i);
+            }
+        });
+    };
+    page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Index.cshtml
new file mode 100644
index 000000000..3de085ccb
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Index.cshtml	
@@ -0,0 +1,37 @@
+@{
+    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>
+                                    <input id="Name" type="text" class="form-control" />
+                                </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>
+                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TeachingPlan/Index.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Index.js
new file mode 100644
index 000000000..743306daa
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/Index.js	
@@ -0,0 +1,116 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-10-14 10:09
+ * 描  述：教学计划
+ */
+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);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/TeachingPlan/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 + '/EducationalAdministration/TeachingPlan/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 + '/EducationalAdministration/TeachingPlan/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/TeachingPlan/GetPageList',
+                headData: [
+                    { label: "名称", name: "Name", width: 100, align: "left" },
+                    { label: "年级", name: "Grade", width: 100, align: "left" },
+                    {
+                        label: "专业", name: "Major", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "学制", name: "SchoolSystem", width: 100, align: "left" },
+                    { label: "总学分", name: "Credit", width: 100, align: "left" },
+                    {
+                        label: "状态", name: "Enabled", width: 100, align: "left",
+                        formatter: function (value, row) {
+                            return value == 1
+                                ? "<span class=\"label label-success\">启用</span>"
+                                : "<span class=\"label label-danger\">禁用</span>";
+                        }
+                    },
+                    { label: "备注", name: "Remark", 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();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/IndexManage.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/IndexManage.cshtml
new file mode 100644
index 000000000..256f5edc4
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/IndexManage.cshtml	
@@ -0,0 +1,36 @@
+@{
+    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>
+                                    <input id="Name" type="text" class="form-control" />
+                                </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_look" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看</a>
+                        <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TeachingPlan/IndexManage.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/IndexManage.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/IndexManage.js
new file mode 100644
index 000000000..b18b65fa6
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlan/IndexManage.js	
@@ -0,0 +1,107 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-10-14 10:09
+ * 描  述：教学计划
+ */
+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);
+            }, 220, 400);
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            //查看
+            $('#lr_look').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '查看',
+                    url: top.$.rootUrl + '/EducationalAdministration/TeachingPlan/FormManageView',
+                    width: 600,
+                    height: 400,
+                    btn: null,
+                    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_FormManage',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/TeachingPlan/FormManage?keyValue=' + keyValue,
+                        width: 1100,
+                        height: 700,
+                        callBack: function (id) {
+                            var res = false;
+                            // 验证数据
+                            res = top[id].validForm();
+                            // 保存数据
+                            if (res) {
+                                res = top[id].save(function () {
+                                    page.search();
+                                });
+                            }
+                            return res;
+                            //return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/TeachingPlan/GetPageListForManage',
+                headData: [
+                    { label: "名称", name: "Name", width: 100, align: "left" },
+                    { label: "年级", name: "Grade", width: 100, align: "left" },
+                    {
+                        label: "专业", name: "Major", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "学制", name: "SchoolSystem", 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" },
+                ],
+                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();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlanItem/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlanItem/Form.cshtml
new file mode 100644
index 000000000..328228ab3
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlanItem/Form.cshtml	
@@ -0,0 +1,32 @@
+@{
+    ViewBag.Title = "教学计划--课程子表";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlanItem">
+        <div class="lr-form-item-title">课程名称</div>
+        <input id="LessonNo" type="text" class="form-control" readonly="readonly" />
+        <input id="LessonName" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlanItem">
+        <div class="lr-form-item-title">课程学时</div>
+        <input id="LessonTime" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlanItem">
+        <div class="lr-form-item-title">执行学期</div>
+        <input id="Semester" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlanItem">
+        <div class="lr-form-item-title">周节次</div>
+        <input id="WeeklyFestival" type="text" class="form-control" placeholder="共7节" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlanItem">
+        <div class="lr-form-item-title">开课起始周</div>
+        <input id="WeeklyStart" type="text" class="form-control" placeholder="共25周" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeachingPlanItem">
+        <div class="lr-form-item-title">开课结束周</div>
+        <input id="WeeklyEnd" type="text" class="form-control" placeholder="共25周" />
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/TeachingPlanItem/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlanItem/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlanItem/Form.js
new file mode 100644
index 000000000..9be1356dc
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/TeachingPlanItem/Form.js	
@@ -0,0 +1,85 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-10-15 10:08
+ * 描  述：教学计划--课程子表
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var selectedRow;
+var bootstrap = function ($, learun) {
+    "use strict";
+    selectedRow = top["layer_form_FormManage"].selectedRow;
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#LessonNo').hide();
+        },
+        initData: function () {
+            //if (!!keyValue) {
+            //    $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/TeachingPlanItem/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]);
+            //            }
+            //        }
+            //    });
+            //}
+
+            if (!!keyValue) {
+                if (!!selectedRow) {
+                    $('#form').lrSetFormData(selectedRow);
+
+                    if (!!selectedRow.LessonNo) {
+                        learun.clientdata.getAsync('custmerData', {
+                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                            key: selectedRow.LessonNo,
+                            keyId: 'lessonno',
+                            callback: function (_data) {
+                                $('#LessonName').val(_data['lessonname']);
+                            }
+                        });
+                    }
+                }
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        //var postData = {
+        //    strEntity: JSON.stringify($('body').lrGetFormData())
+        //};
+        //$.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/TeachingPlanItem/SaveForm?keyValue=' + keyValue, postData, function (res) {
+        //    // 保存成功后才回调
+        //    if (!!callBack) {
+        //        callBack();
+        //    }
+        //});
+
+
+        var postData = $('body').lrGetFormData();
+        if (!!keyValue) {
+            if (!!selectedRow) {
+                postData.Id = selectedRow.Id;
+            }
+        } else {
+            postData.Id = learun.newGuid();
+        }
+        if (!!callBack) {
+            callBack(postData);
+            return true;
+        }
+
+    };
+    page.init();
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index 3c4192dc4..1e84d69e5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
@@ -334,6 +334,8 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\StuInfoBasicChangeController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuScoreNotPassController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\Sys_ReceiveDocumentController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\TeachingPlanController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\TeachingPlanItemController.cs" />
     <Compile Include="Areas\EvaluationTeach\EvaluationTeachAreaRegistration.cs" />
     <Compile Include="Areas\EvaluationTeach\Controllers\Eval_MainController.cs" />
     <Compile Include="Areas\EvaluationTeach\Controllers\Eval_QuestionController.cs" />
@@ -1083,6 +1085,12 @@
     <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\PrintView.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\ReadListParty.js" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_SendFile\ReadListDocument.js" />
+    <Content Include="Areas\EducationalAdministration\Views\TeachingPlanItem\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\FormManage.js" />
+    <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\FormManageView.js" />
+    <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\IndexManage.js" />
     <Content Include="Areas\EducationalAdministration\Views\Thermography\IndexResult.js" />
     <Content Include="Areas\EducationalAdministration\Views\Thermography\StatisticIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\Thermography\SubmitIndex.js" />
@@ -7404,6 +7412,12 @@
     <Content Include="Areas\LogisticsManagement\Views\ProjectManage\Index1.cshtml" />
     <Content Include="Areas\LogisticsManagement\Views\ProjectProcessManage\IndexData1.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\RoleForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\TeachingPlanItem\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\FormManage.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\FormManageView.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\IndexManage.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config
index 9bf9ddc7d..e8ec2112c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config	
@@ -20,13 +20,13 @@
   <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
 
-  <!--<add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_20200403test;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />-->
+  <add name="BaseDb" connectionString="Server=123.57.209.16;Initial Catalog=adms7ultimate2_金隅;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="CollegeMIS" connectionString="Server=123.57.209.16;Initial Catalog=CollegeMIS_金隅;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
+  <add name="hangfireString" connectionString="Server=123.57.209.16;Initial Catalog=Hangfire;User ID=sa;Password=bjqjkj@2014~2015!" providerName="System.Data.SqlClient" />
   <!--金隅-->
-  <add name="BaseDb" connectionString="Server=192.168.100.224;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
+  <!--<add name="BaseDb" connectionString="Server=192.168.100.224;Initial Catalog=adms7ultimate2;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.100.224;Initial Catalog=CollegeMIS;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
-  <add name="hangfireString" connectionString="Server=192.168.100.224;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />
+  <add name="hangfireString" connectionString="Server=192.168.100.224;Initial Catalog=Hangfire;User ID=sa;Password=Jykj@2019" providerName="System.Data.SqlClient" />-->
   <!--126西昌测试-->
   <!--<add name="BaseDb" connectionString="Server=192.168.2.126;Initial Catalog=adms7ultimate2_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
   <add name="CollegeMIS" connectionString="Server=192.168.2.126;Initial Catalog=CollegeMIS_西昌;User ID=sa;Password=bjqj@2015!" providerName="System.Data.SqlClient" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/TeachingPlanItemMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/TeachingPlanItemMap.cs
new file mode 100644
index 000000000..8f0ce73cb
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/TeachingPlanItemMap.cs	
@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-10-15 10:08
+    /// 描 述：教学计划--课程子表
+    /// </summary>
+    public class TeachingPlanItemMap : EntityTypeConfiguration<TeachingPlanItemEntity>
+    {
+        public TeachingPlanItemMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("TEACHINGPLANITEM");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/TeachingPlanMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/TeachingPlanMap.cs
new file mode 100644
index 000000000..03d269156
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/TeachingPlanMap.cs	
@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-10-14 10:09
+    /// 描 述：教学计划
+    /// </summary>
+    public class TeachingPlanMap : EntityTypeConfiguration<TeachingPlanEntity>
+    {
+        public TeachingPlanMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("TEACHINGPLAN");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj
index f5205540b..f26dcfc18 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj	
@@ -91,6 +91,8 @@
     <Compile Include="EducationalAdministration\StuScoreNotPassMap.cs" />
     <Compile Include="EducationalAdministration\StuSelectLessonListOfElectivePreMap.cs" />
     <Compile Include="EducationalAdministration\Sys_ReceiveFileMap.cs" />
+    <Compile Include="EducationalAdministration\TeachingPlanItemMap.cs" />
+    <Compile Include="EducationalAdministration\TeachingPlanMap.cs" />
     <Compile Include="EducationalAdministration\TeachPlanMap.cs" />
     <Compile Include="EducationalAdministration\TeachSwitchMap.cs" />
     <Compile Include="EducationalAdministration\Teach_attendanceMap.cs" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanBLL.cs
new file mode 100644
index 000000000..0a42a8b50
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanBLL.cs	
@@ -0,0 +1,167 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-10-14 10:09
+    /// 描 述：教学计划
+    /// </summary>
+    public class TeachingPlanBLL : TeachingPlanIBLL
+    {
+        private TeachingPlanService teachingPlanService = new TeachingPlanService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<TeachingPlanEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return teachingPlanService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public IEnumerable<TeachingPlanEntity> GetPageListForManage(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return teachingPlanService.GetPageListForManage(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 获取TeachingPlan表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public TeachingPlanEntity GetTeachingPlanEntity(string keyValue)
+        {
+            try
+            {
+                return teachingPlanService.GetTeachingPlanEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 根据学年获取教学计划
+        /// </summary>
+        /// <param name="AcademicYearNo"></param>
+        /// <param name="Semester"></param>
+        /// <returns></returns>
+        public List<TeachingPlanRes> GetTeachingPlan(string AcademicYearNo, string Semester)
+        {
+            try
+            {
+                return teachingPlanService.GetTeachingPlan(AcademicYearNo, Semester);
+            }
+            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
+            {
+                teachingPlanService.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, TeachingPlanEntity entity, List<TeachingPlanItemEntity> teachingPlanItemList)
+        {
+            try
+            {
+                teachingPlanService.SaveEntity(keyValue, entity, teachingPlanItemList);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanEntity.cs
new file mode 100644
index 000000000..bf826840a
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanEntity.cs	
@@ -0,0 +1,121 @@
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-10-14 10:09
+    /// 描 述：教学计划
+    /// </summary>
+    public class TeachingPlanEntity
+    {
+        #region 实体成员
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        [Column("NAME")]
+        public string Name { get; set; }
+        /// <summary>
+        /// 年级
+        /// </summary>
+        [Column("GRADE")]
+        public string Grade { get; set; }
+        /// <summary>
+        /// 专业
+        /// </summary>
+        [Column("MAJOR")]
+        public string Major { get; set; }
+        /// <summary>
+        /// 学制
+        /// </summary>
+        [Column("SCHOOLSYSTEM")]
+        public string SchoolSystem { get; set; }
+        /// <summary>
+        /// 总学分
+        /// </summary>
+        [Column("CREDIT")]
+        public string Credit { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// 禁用 启用
+        /// </summary>
+        [Column("ENABLED")]
+        public bool? Enabled { get; set; }
+        /// <summary>
+        /// CreateUserId
+        /// </summary>
+        [Column("CREATEUSERID")]
+        public string CreateUserId { get; set; }
+        /// <summary>
+        /// CreateTime
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.Id = Guid.NewGuid().ToString();
+            this.CreateTime = DateTime.Now;
+            this.CreateUserId = LoginUserInfo.Get().userId;
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.Id = keyValue;
+        }
+        #endregion
+        #region 扩展字段
+
+        /// <summary>
+        /// 专业课
+        /// </summary>
+        [NotMapped]
+        public int? Zyknum { get; set; }
+        /// <summary>
+        /// 公共课
+        /// </summary>
+        [NotMapped]
+        public int? Ggknum { get; set; }
+        #endregion
+    }
+
+    public class LessonData
+    {
+        [NotMapped]
+        public string Major { get; set; }
+        [NotMapped]
+        public string LessonTypeName { get; set; }
+        [NotMapped]
+        public int? num { get; set; }
+    }
+
+    public class TeachingPlanRes
+    {
+        public TeachingPlanEntity TeachingPlan { get; set; }
+        public IEnumerable<TeachingPlanItemEntity>  TeachingPlanItem { get; set; }
+    }
+
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanIBLL.cs
new file mode 100644
index 000000000..079742fdc
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanIBLL.cs	
@@ -0,0 +1,51 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-10-14 10:09
+    /// 描 述：教学计划
+    /// </summary>
+    public interface TeachingPlanIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<TeachingPlanEntity> GetPageList(Pagination pagination, string queryJson);
+        IEnumerable<TeachingPlanEntity> GetPageListForManage(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取TeachingPlan表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        TeachingPlanEntity GetTeachingPlanEntity(string keyValue);
+
+        List<TeachingPlanRes> GetTeachingPlan(string AcademicYearNo,string Semester);
+        #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, TeachingPlanEntity entity, List<TeachingPlanItemEntity> teachingPlanItemList);
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanService.cs
new file mode 100644
index 000000000..7641566ea
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlan/TeachingPlanService.cs	
@@ -0,0 +1,270 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-10-14 10:09
+    /// 描 述：教学计划
+    /// </summary>
+    public class TeachingPlanService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<TeachingPlanEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            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("  FROM TeachingPlan t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["Name"].IsEmpty())
+                {
+                    dp.Add("Name", "%" + queryParam["Name"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Name Like @Name ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<TeachingPlanEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        public IEnumerable<TeachingPlanEntity> GetPageListForManage(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                string sql = "select * from TeachingPlan ";
+                var dp = new DynamicParameters(new { });
+                var list = this.BaseRepository("CollegeMIS").FindList<TeachingPlanEntity>(sql, dp, pagination);
+
+                string tsql = @"select t.*,c.LessonTypeName from 
+(select t.Major,b.LessonTypeId,count(1) as num from TeachingPlan t 
+join TeachingPlanItem a on t.Id=a.TeachingPlanId
+join LessonInfo b on a.LessonNo=b.LessonNo
+group by b.LessonTypeId,t.Major) t
+join CdLessonType c on t.LessonTypeId=c.ltid ";
+                var lessonList = this.BaseRepository("CollegeMIS").FindList<LessonData>(tsql);
+                foreach (var item in list)
+                {
+                    var lessonData = lessonList.Where(x => x.Major == item.Major);
+                    foreach (var lesson in lessonData)
+                    {
+                        if (lesson.LessonTypeName.Contains("专业课"))
+                        {
+                            item.Zyknum = lesson.num;
+                        }
+                        else if (lesson.LessonTypeName.Contains("公开课"))
+                        {
+                            item.Ggknum = lesson.num;
+                        }
+                    }
+                }
+
+                return list;
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取TeachingPlan表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public TeachingPlanEntity GetTeachingPlanEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<TeachingPlanEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 根据学年获取教学计划
+        /// </summary>
+        /// <param name="AcademicYearNo"></param>
+        /// <param name="Semester"></param>
+        /// <returns></returns>
+        public List<TeachingPlanRes> GetTeachingPlan(string AcademicYearNo, string Semester)
+        {
+            try
+            {
+                var res = new List<TeachingPlanRes>();
+                var list = new List<TeachingPlanEntity>();
+                if (!string.IsNullOrEmpty(AcademicYearNo))
+                {
+                    list = this.BaseRepository("CollegeMIS")
+                        .FindList<TeachingPlanEntity>(x => x.Grade == AcademicYearNo).ToList();
+                }
+                else
+                {
+                    list = this.BaseRepository("CollegeMIS")
+                        .FindList<TeachingPlanEntity>().ToList();
+                }
+
+                foreach (var entity in list)
+                {
+                    var data = new TeachingPlanRes();
+                    data.TeachingPlan = entity;
+                    data.TeachingPlanItem = this.BaseRepository("CollegeMIS")
+                        .FindList<TeachingPlanItemEntity>(x => x.TeachingPlanId == entity.Id);
+                    res.Add(data);
+                }
+
+                return res;
+            }
+            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<TeachingPlanEntity>(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, TeachingPlanEntity entity, List<TeachingPlanItemEntity> teachingPlanItemList)
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    db.Update(entity);
+                    //删除课程子表
+                    db.Delete<TeachingPlanItemEntity>(x => x.TeachingPlanId == entity.Id);
+                    foreach (var itemEntity in teachingPlanItemList)
+                    {
+                        itemEntity.TeachingPlanId = entity.Id;
+                        db.Insert(itemEntity);
+                    }
+                }
+                else
+                {
+                    entity.Create();
+                    db.Insert(entity);
+                    //新增
+                    var lessonInfoList = db.FindList<LessonInfoEntity>(x => x.TeachMajorNo == entity.Major);
+                    foreach (var lessonInfo in lessonInfoList)
+                    {
+                        TeachingPlanItemEntity itemEntity = new TeachingPlanItemEntity();
+                        itemEntity.Create();
+                        itemEntity.TeachingPlanId = entity.Id;
+                        itemEntity.LessonNo = lessonInfo.LessonNo;
+                        itemEntity.LessonTime = lessonInfo.TotalStudyHour;
+                        db.Insert(itemEntity);
+                    }
+                }
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlanItem/TeachingPlanItemBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlanItem/TeachingPlanItemBLL.cs
new file mode 100644
index 000000000..8a691ca9b
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlanItem/TeachingPlanItemBLL.cs	
@@ -0,0 +1,144 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-10-15 10:08
+    /// 描 述：教学计划--课程子表
+    /// </summary>
+    public class TeachingPlanItemBLL : TeachingPlanItemIBLL
+    {
+        private TeachingPlanItemService teachingPlanItemService = new TeachingPlanItemService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<TeachingPlanItemEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return teachingPlanItemService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public IEnumerable<TeachingPlanItemEntity> GetListByPlanId(string PlanId)
+        {
+            try
+            {
+                return teachingPlanItemService.GetListByPlanId(PlanId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取TeachingPlanItem表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public TeachingPlanItemEntity GetTeachingPlanItemEntity(string keyValue)
+        {
+            try
+            {
+                return teachingPlanItemService.GetTeachingPlanItemEntity(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
+            {
+                teachingPlanItemService.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, TeachingPlanItemEntity entity)
+        {
+            try
+            {
+                teachingPlanItemService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlanItem/TeachingPlanItemEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlanItem/TeachingPlanItemEntity.cs
new file mode 100644
index 000000000..67fb19bd9
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlanItem/TeachingPlanItemEntity.cs	
@@ -0,0 +1,85 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-10-15 10:08
+    /// 描 述：教学计划--课程子表
+    /// </summary>
+    public class TeachingPlanItemEntity
+    {
+        #region 实体成员
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 教学计划Id
+        /// </summary>
+        [Column("TEACHINGPLANID")]
+        public string TeachingPlanId { get; set; }
+        /// <summary>
+        /// 课程
+        /// </summary>
+        [Column("LESSONNO")]
+        public string LessonNo { get; set; }
+        /// <summary>
+        /// 课程学时
+        /// </summary>
+        [Column("LESSONTIME")]
+        public decimal? LessonTime { get; set; }
+        /// <summary>
+        /// 执行学期
+        /// </summary>
+        [Column("SEMESTER")]
+        public string Semester { get; set; }
+        /// <summary>
+        /// 周节次
+        /// </summary>
+        [Column("WEEKLYFESTIVAL")]
+        public int? WeeklyFestival { get; set; }
+        /// <summary>
+        /// 开课起始周
+        /// </summary>
+        [Column("WEEKLYSTART")]
+        public int? WeeklyStart { get; set; }
+        /// <summary>
+        /// 开课结束周
+        /// </summary>
+        [Column("WEEKLYEND")]
+        public int? WeeklyEnd { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { 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
+    }
+}
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlanItem/TeachingPlanItemIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlanItem/TeachingPlanItemIBLL.cs
new file mode 100644
index 000000000..3ca0243da
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlanItem/TeachingPlanItemIBLL.cs	
@@ -0,0 +1,50 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-10-15 10:08
+    /// 描 述：教学计划--课程子表
+    /// </summary>
+    public interface TeachingPlanItemIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<TeachingPlanItemEntity> GetPageList(Pagination pagination, string queryJson);
+
+        IEnumerable<TeachingPlanItemEntity> GetListByPlanId(string PlanId);
+        /// <summary>
+        /// 获取TeachingPlanItem表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        TeachingPlanItemEntity GetTeachingPlanItemEntity(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, TeachingPlanItemEntity entity);
+        #endregion
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlanItem/TeachingPlanItemService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlanItem/TeachingPlanItemService.cs
new file mode 100644
index 000000000..f3fc53b86
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/TeachingPlanItem/TeachingPlanItemService.cs	
@@ -0,0 +1,170 @@
+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.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-10-15 10:08
+    /// 描 述：教学计划--课程子表
+    /// </summary>
+    public class TeachingPlanItemService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<TeachingPlanItemEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.Id,
+                t.Semester,
+                t.WeeklyFestival,
+                t.WeeklyStart,
+                t.WeeklyEnd
+                ");
+                strSql.Append("  FROM TeachingPlanItem t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                return this.BaseRepository("CollegeMIS").FindList<TeachingPlanItemEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取TeachingPlanItem表数据
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<TeachingPlanItemEntity> GetListByPlanId(string PlanId)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindList<TeachingPlanItemEntity>(x => x.TeachingPlanId == PlanId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 获取TeachingPlanItem表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public TeachingPlanItemEntity GetTeachingPlanItemEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<TeachingPlanItemEntity>(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<TeachingPlanItemEntity>(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, TeachingPlanItemEntity 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
+
+    }
+}
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj
index 5a3cffe61..0bc770897 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj	
@@ -217,6 +217,14 @@
     <Compile Include="EducationalAdministration\TeachingMaterial\TeachingMaterialEntity.cs" />
     <Compile Include="EducationalAdministration\TeachingMaterial\TeachingMaterialIBLL.cs" />
     <Compile Include="EducationalAdministration\TeachingMaterial\TeachingMaterialService.cs" />
+    <Compile Include="EducationalAdministration\TeachingPlanItem\TeachingPlanItemBLL.cs" />
+    <Compile Include="EducationalAdministration\TeachingPlanItem\TeachingPlanItemEntity.cs" />
+    <Compile Include="EducationalAdministration\TeachingPlanItem\TeachingPlanItemIBLL.cs" />
+    <Compile Include="EducationalAdministration\TeachingPlanItem\TeachingPlanItemService.cs" />
+    <Compile Include="EducationalAdministration\TeachingPlan\TeachingPlanBLL.cs" />
+    <Compile Include="EducationalAdministration\TeachingPlan\TeachingPlanEntity.cs" />
+    <Compile Include="EducationalAdministration\TeachingPlan\TeachingPlanIBLL.cs" />
+    <Compile Include="EducationalAdministration\TeachingPlan\TeachingPlanService.cs" />
     <Compile Include="EducationalAdministration\TeachPlan\TeachPlanBLL.cs" />
     <Compile Include="EducationalAdministration\TeachPlan\TeachPlanEntity.cs" />
     <Compile Include="EducationalAdministration\TeachPlan\TeachPlanIBLL.cs" />