Merge branch '塔里木分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 塔里木分支

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

@@ -764,6 +764,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 
             return Success("报名成功");
         }
+
+        /// <summary>
+        /// 初始化学生选课记录
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult InitStuSelectLesson(string keyvalue)
+        {
+            openLessonPlanOfElectiveIBLL.InitStuSelectLesson(keyvalue);
+            return Success("操作成功！");
+        }
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/MergeIndex.cshtml

@@ -35,8 +35,9 @@
                         <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_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>*@
                         <a id="lr_editMajor" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;管理选课专业</a>
+                        @*<a id="lr_initStuSelectLesson" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;初始化学生选课记录</a>*@
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-group"></i>&nbsp;设置人数</a>
                         <a id="lr_modify" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;异动</a>
                     </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/OpenLessonPlanOfElective/MergeIndex.js

@@ -171,6 +171,25 @@ var bootstrap = function ($, learun) {
                     });
                 }
             });
+           
+            //初始化学生选课记录
+            $('#lr_initStuSelectLesson').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    //选课专业
+                    var ElectiveMajorList = $('#gridtable').jfGridValue('ElectiveMajorList');
+                    if (ElectiveMajorList.length <= 0) {
+                        return learun.alert.warning("请先管理选课专业！");
+                    }
+                    learun.layerConfirm('是否确认初始化学生选课记录！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/OpenLessonPlanOfElective/InitStuSelectLesson', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
         },
         // 初始化列表
         initGird: function () {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveBLL.cs

@@ -230,6 +230,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        public void InitStuSelectLesson(string keyvalue)
+        {
+            try
+            {
+                openLessonPlanOfElectiveService.InitStuSelectLesson(keyvalue);
+            }
+            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/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveIBLL.cs

@@ -69,6 +69,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <summary>
         /// <returns></returns>
         void DoElectiveChange(OpenLessonPlanOfElectiveChangeEntity entity);
+        
+        void InitStuSelectLesson(string keyvalue);
 
         #endregion
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/OpenLessonPlanOfElective/OpenLessonPlanOfElectiveService.cs

@@ -510,6 +510,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 初始化学生选课情况
+        /// </summary>
+        /// <param name="keyvalue"></param>
+        public void InitStuSelectLesson(string keyvalue)
+        {
+            try
+            {
+
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
     }
 }