Merge branch '中职版本' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 中职版本

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/EATalentTrainController.cs

@@ -111,6 +111,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             }
             return Success("保存成功！");
         }
+        /// <summary>
+        /// 修改状态
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult UpdateStatus(string keyValue,int Status)
+        {
+            eATalentTrainIBLL.UpdateStatus(keyValue, Status);
+            return Success("操作成功！");
+        }
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/TeachingPlanController.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-14 10:09
+    /// 描 述：教学计划
+    /// </summary>
+    public class TeachingPlanController : MvcControllerBase
+    {
+        private TeachingPlanIBLL teachingPlanIBLL = new TeachingPlanBLL();
+
+        #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 = 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="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var TeachingPlanData = teachingPlanIBLL.GetTeachingPlanEntity( keyValue );
+            var jsonData = new {
+                TeachingPlan = TeachingPlanData,
+            };
+            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)
+        {
+            TeachingPlanEntity entity = strEntity.ToObject<TeachingPlanEntity>();
+            teachingPlanIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -3,33 +3,61 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item"  data-table="EATalentTrain" >
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
+        <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="EATalentTrain">
         <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
-        <div id="AcademicYearNo" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="AcademicYearNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EATalentTrain" >
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
         <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
-        <div id="Semester" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="Semester" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EATalentTrain" >
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
-        <div id="MajorNo" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="MajorNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EATalentTrain" >
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
         <div class="lr-form-item-title">入学要求</div>
-        <input id="EntranceRequire" type="text" class="form-control"  />
+        <input id="EntranceRequire" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EATalentTrain" >
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
         <div class="lr-form-item-title">修业年限</div>
-        <input id="YearLimit" type="text" class="form-control"  />
+        <input id="YearLimit" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EATalentTrain" >
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
         <div class="lr-form-item-title">培训方案</div>
-        <div id="ProgramFile"  ></div>
+        <div id="ProgramFile"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
+        <div class="lr-form-item-title">计划招生人数</div>
+        <input id="PlannedNum" type="number" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
+        <div class="lr-form-item-title">计划教学课程</div>
+        <div id="PlannedCourse"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
+        <div class="lr-form-item-title">就业领域</div>
+        <input id="EmploymentField" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
+        <div class="lr-form-item-title">教学条件</div>
+        <input id="TeachingCondition" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
+        <div class="lr-form-item-title">教学资源</div>
+        <input id="TeachingResource" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
+        <div class="lr-form-item-title">培养目标</div>
+        <input id="TrainingObjectives" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EATalentTrain" >
+    <div class="col-xs-12 lr-form-item" data-table="EATalentTrain">
         <div class="lr-form-item-title">备注</div>
-        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/EATalentTrain/Form.js")

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

@@ -31,7 +31,9 @@ var bootstrap = function ($, learun) {
                 value: 'value',
                 text: 'text'
             });
-            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'majorno',text: 'majorname' });
+            $('#MajorNo').lrDataSourceSelect({ code: 'CdMajorInfo', value: 'majorno', text: 'majorname' });
+            $('#PlannedCourse').lrDataSourceSelect({ code: 'LessonInfo', value: 'lessonno', text: 'lessonname', type: 'multiple' });
+            
             $('#ProgramFile').lrUploader();
         },
         initData: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/EATalentTrain/Index.cshtml

@@ -31,9 +31,12 @@
                         <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_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_submit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;提交</a>
+                        <a id="lr_check" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;审核通过</a>
+                        <a id="lr_nocheck" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;未通过</a>
                     </div>
                 </div>
             </div>

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

@@ -79,12 +79,80 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+
+            //提交
+            $('#lr_submit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status != 0) {
+                        return learun.alert.warning('只有草稿状态才可提交！');
+                    }
+                    learun.layerConfirm('是否确认提交该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/EATalentTrain/UpdateStatus', { keyValue: keyValue, Status: 1 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //审核通过
+            $('#lr_check').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status == 0) {
+                        return learun.alert.warning('请先提交！');
+                    }
+                    learun.layerConfirm('是否确认审核通过该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/EATalentTrain/UpdateStatus', { keyValue: keyValue, Status: 2 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //审核不通过
+            $('#lr_nocheck').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var Status = $('#gridtable').jfGridValue('Status');
+                    if (Status == 0) {
+                        return learun.alert.warning('请先提交！');
+                    }
+                    learun.layerConfirm('是否确认审核不通过该项！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/EATalentTrain/UpdateStatus', { keyValue: keyValue, Status: 3 }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/EATalentTrain/GetPageList',
                 headData: [
+                    { label: "方案名称", name: "Name", width: 150, align: "left" },
+                    {
+                        label: "状态", name: "Status", width: 100, align: "left",
+                        formatter: function (cellvalue, row) {
+                            if (cellvalue == 0) {
+                                return '<span class=\"label label-default\">草稿</span>';
+                            } else if (cellvalue == 1) {
+                                return "<span class=\"label label-warning\">待审核</span>";
+                            } else if (cellvalue == 2) {
+                                return "<span class=\"label label-success\">审核通过</span>";
+                            } else {
+                                return "<span class=\"label label-danger\">未通过</span>";
+                            }
+
+                        }
+                    },
                     { label: "学年", name: "AcademicYearNo", width: 100, align: "left" },
                     { label: "学期", name: "Semester", width: 100, align: "left" },
                     {
@@ -102,6 +170,24 @@ var bootstrap = function ($, learun) {
                     },
                     { label: "入学要求", name: "EntranceRequire", width: 150, align: "left" },
                     { label: "修业年限", name: "YearLimit", width: 100, align: "left" },
+                    { label: "计划招生人数", name: "PlannedNum", width: 100, align: "left" },
+                    {
+                        label: "计划教学课程", name: "PlannedCourse", 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: 'lessonid',
+                                callback: function (_data) {
+                                    callback(_data['lessonname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "就业领域", name: "EmploymentField", width: 100, align: "left" },
+                    { label: "教学条件", name: "TeachingCondition", width: 100, align: "left" },
+                    { label: "教学资源", name: "TeachingResource", width: 100, align: "left" },
+                    { label: "培养目标", name: "TrainingObjectives", width: 100, align: "left" },
                 ],
                 mainId: 'Id',
                 isPage: true

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")

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

@@ -0,0 +1,64 @@
+/* * 版 本 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({
+                placeholder: "请选择学年",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text'
+            });
+
+            $('#Major').lrDataSourceSelect({ code: 'CdMajorInfo',value: 'id',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();
+}

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")

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: 'id',
+                                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();
+}

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

@@ -814,6 +814,7 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\AwardPunishInfoController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\ScholarshipController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\ScholarshipxjController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\TeachingPlanController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -6402,6 +6403,10 @@
     <Content Include="Areas\EducationalAdministration\Views\Scholarshipxj\Indexzxj.js" />
     <Content Include="Areas\EducationalAdministration\Views\Scholarshipxj\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Scholarshipxj\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\TeachingPlan\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\LR_Desktop\Models\" />

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
+        }
+    }
+}
+

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

@@ -564,6 +564,7 @@
     <Compile Include="EducationalAdministration\AwardPunishInfoMap.cs" />
     <Compile Include="EducationalAdministration\ScholarshipMap.cs" />
     <Compile Include="EducationalAdministration\ScholarshipAuditMap.cs" />
+    <Compile Include="EducationalAdministration\TeachingPlanMap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EATalentTrain/EATalentTrainBLL.cs

@@ -93,7 +93,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-
+        /// <summary>
+        /// 修改状态
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void UpdateStatus(string keyValue, int Status)
+        {
+            try
+            {
+                eATalentTrainService.UpdateStatus(keyValue, Status);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        
         /// <summary>
         /// 保存实体数据（新增、修改）
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EATalentTrain/EATalentTrainEntity.cs

@@ -20,6 +20,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("ID")]
         public string Id { get; set; }
         /// <summary>
+        /// 方案名称
+        /// </summary>
+        [Column("NAME")]
+        public string Name { get; set; }
+        /// <summary>
         /// 学年
         /// </summary>
         [Column("ACADEMICYEARNO")]
@@ -54,6 +59,44 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("REMARK")]
         public string Remark { get; set; }
+
+        /// <summary>
+        /// 计划招生人数
+        /// </summary>
+        [Column("PLANNEDNUM")]
+        public int? PlannedNum { get; set; }
+        /// <summary>
+        /// 计划教学课程
+        /// </summary>
+        [Column("PLANNEDCOURSE")]
+        public string PlannedCourse { get; set; }
+        /// <summary>
+        /// 就业领域
+        /// </summary>
+        [Column("EMPLOYMENTFIELD")]
+        public string EmploymentField { get; set; }
+        /// <summary>
+        /// 教学条件
+        /// </summary>
+        [Column("TEACHINGCONDITION")]
+        public string TeachingCondition { get; set; }
+        /// <summary>
+        /// 教学资源
+        /// </summary>
+        [Column("TEACHINGRESOURCE")]
+        public string TeachingResource { get; set; }
+        /// <summary>
+        /// 培养目标
+        /// </summary>
+        [Column("TRAININGOBJECTIVES")]
+        public string TrainingObjectives { get; set; }
+
+        /// <summary>
+        /// 状态
+        /// </summary>
+        [Column("STATUS")]
+        public int? Status { get; set; }
+        
         #endregion
 
         #region 扩展操作
@@ -63,6 +106,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         public void Create()
         {
             this.Id = Guid.NewGuid().ToString();
+            this.Status = 0;
         }
         /// <summary>
         /// 编辑调用

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EATalentTrain/EATalentTrainIBLL.cs

@@ -36,6 +36,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         /// <param name="keyValue">主键</param>
         void DeleteEntity(string keyValue);
+        void UpdateStatus(string keyValue, int Status);
         /// <summary>
         /// 保存实体数据（新增、修改）
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EATalentTrain/EATalentTrainService.cs

@@ -38,20 +38,20 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var dp = new DynamicParameters(new { });
                 if (!queryParam["AcademicYearNo"].IsEmpty())
                 {
-                    dp.Add("AcademicYearNo",queryParam["AcademicYearNo"].ToString(), DbType.String);
+                    dp.Add("AcademicYearNo", queryParam["AcademicYearNo"].ToString(), DbType.String);
                     strSql.Append(" AND t.AcademicYearNo = @AcademicYearNo ");
                 }
                 if (!queryParam["Semester"].IsEmpty())
                 {
-                    dp.Add("Semester",queryParam["Semester"].ToString(), DbType.String);
+                    dp.Add("Semester", queryParam["Semester"].ToString(), DbType.String);
                     strSql.Append(" AND t.Semester = @Semester ");
                 }
                 if (!queryParam["MajorNo"].IsEmpty())
                 {
-                    dp.Add("MajorNo",queryParam["MajorNo"].ToString(), DbType.String);
+                    dp.Add("MajorNo", queryParam["MajorNo"].ToString(), DbType.String);
                     strSql.Append(" AND t.MajorNo = @MajorNo ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<EATalentTrainEntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository("CollegeMIS").FindList<EATalentTrainEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -102,7 +102,27 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<EATalentTrainEntity>(t=>t.Id == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<EATalentTrainEntity>(t => t.Id == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        public void UpdateStatus(string keyValue, int Status)
+        {
+            try
+            {
+                string sql = $"update EATalentTrain set Status={Status} where Id='{keyValue}'";
+                this.BaseRepository("CollegeMIS").ExecuteBySql(sql);
             }
             catch (Exception ex)
             {

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

@@ -0,0 +1,125 @@
+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);
+                }
+            }
+        }
+
+        /// <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);
+                }
+            }
+        }
+
+        #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)
+        {
+            try
+            {
+                teachingPlanService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,92 @@
+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-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 扩展字段
+        #endregion
+    }
+}
+

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

@@ -0,0 +1,48 @@
+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);
+        /// <summary>
+        /// 获取TeachingPlan表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        TeachingPlanEntity GetTeachingPlanEntity(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, TeachingPlanEntity entity);
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,156 @@
+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-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);
+                }
+            }
+        }
+
+        /// <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);
+                }
+            }
+        }
+
+        #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)
+        {
+            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
+
+    }
+}

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

@@ -1674,6 +1674,10 @@
     <Compile Include="EducationalAdministration\Scholarshipzxj\ScholarshipxjService.cs" />
     <Compile Include="EducationalAdministration\Scholarshipzxj\ScholarshipxjBLL.cs" />
     <Compile Include="EducationalAdministration\Scholarshipzxj\ScholarshipxjIBLL.cs" />
+    <Compile Include="EducationalAdministration\TeachingPlan\TeachingPlanEntity.cs" />
+    <Compile Include="EducationalAdministration\TeachingPlan\TeachingPlanService.cs" />
+    <Compile Include="EducationalAdministration\TeachingPlan\TeachingPlanBLL.cs" />
+    <Compile Include="EducationalAdministration\TeachingPlan\TeachingPlanIBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">