合并

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

@@ -26,7 +26,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
         /// <summary>
         /// 表单页
@@ -35,7 +35,25 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult GenerateForm()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult ClearForm()
+        {
+            return View();
         }
         #endregion
 
@@ -71,8 +89,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var Exam_ExamPlanData = exam_ExamPlanIBLL.GetExam_ExamPlanEntity( keyValue );
-            var jsonData = new {
+            var Exam_ExamPlanData = exam_ExamPlanIBLL.GetExam_ExamPlanEntity(keyValue);
+            var jsonData = new
+            {
                 Exam_ExamPlan = Exam_ExamPlanData,
             };
             return Success(jsonData);
@@ -105,12 +124,43 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             Exam_ExamPlanEntity entity = strEntity.ToObject<Exam_ExamPlanEntity>();
-            exam_ExamPlanIBLL.SaveEntity(keyValue,entity);
+            exam_ExamPlanIBLL.SaveEntity(keyValue, entity);
             if (string.IsNullOrEmpty(keyValue))
             {
             }
             return Success("保存成功！");
         }
+
+        /// <summary>
+        /// 生成排考名单
+        /// </summary>
+        /// <param name="AcademicYearNo"></param>
+        /// <param name="Semester"></param>
+        /// <param name="PlanType"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult GenerateForm(string AcademicYearNo, string Semester, string PlanType)
+        {
+            int res = exam_ExamPlanIBLL.ClaerForm(AcademicYearNo, Semester, PlanType);
+            return Success("清空(" + res + ")条数据成功！");
+        }
+        /// <summary>
+        /// 清除排考名单
+        /// </summary>
+        /// <param name="AcademicYearNo"></param>
+        /// <param name="Semester"></param>
+        /// <param name="PlanType"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult ClearForm(string AcademicYearNo, string Semester, string PlanType)
+        {
+            int res = exam_ExamPlanIBLL.GenerateForm(AcademicYearNo, Semester, PlanType);
+            return Success("清空(" + res + ")条数据成功！");
+        }
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/ClearForm.cshtml

@@ -0,0 +1,19 @@
+@{
+    ViewBag.Title = "考试课程表";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="Exam_ExamPlan" >
+        <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
+        <div id="AcademicYearNo" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="Exam_ExamPlan" >
+        <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
+        <div id="Semester" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Exam_ExamPlan">
+        <div class="lr-form-item-title">考试类型</div>
+        <div id="PlanType"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Exam_ExamPlan/ClearForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/ClearForm.js

@@ -0,0 +1,58 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-04-12 15:47
+ * 描  述：考试课程表
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+        },
+        bind: function () {
+            $('#AcademicYearNo').lrselect({
+                placeholder: "学年",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text',
+                maxHeight: 200,
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "学期",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
+                value: 'value',
+                text: 'text'
+            });
+            $('#PlanType').lrDataItemSelect({ code: 'StudentType' });
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            AcademicYearNo: $('#AcademicYearNo').lrselectGet(),
+            Semester: $('#Semester').lrselectGet(),
+            PlanType: $('#PlanType').lrselectGet()
+        };
+        learun.layerConfirm('是否确认清空！', function (res) {
+            if (res) {
+                $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/ClearTable', postData, function (res) {
+                    // 保存成功后才回调
+                    if (!!callBack) {
+                        callBack();
+                    }
+                });
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/GenerateForm.cshtml

@@ -0,0 +1,19 @@
+@{
+    ViewBag.Title = "考试课程表";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item" data-table="Exam_ExamPlan">
+        <div class="lr-form-item-title">学年<font face="宋体">*</font></div>
+        <div id="AcademicYearNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Exam_ExamPlan">
+        <div class="lr-form-item-title">学期<font face="宋体">*</font></div>
+        <div id="Semester" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Exam_ExamPlan">
+        <div class="lr-form-item-title">考试类型<font face="宋体">*</font></div>
+        <div id="PlanType" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Exam_ExamPlan/GenerateForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/GenerateForm.js

@@ -0,0 +1,69 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-04-12 15:47
+ * 描  述：考试课程表
+ */
+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 () {
+            $('#AcademicYearNo').lrselect({
+                placeholder: "学年",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetAcademicYearNo',
+                value: 'value',
+                text: 'text',
+                maxHeight: 200,
+            });
+            //学期
+            $('#Semester').lrselect({
+                placeholder: "学期",
+                allowSearch: false,
+                url: top.$.rootUrl + '/EducationalAdministration/EADateArrange/GetSemester',
+                value: 'value',
+                text: 'text'
+            });
+            $('#PlanType').lrDataItemSelect({ code: 'StudentType' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/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 = {
+            AcademicYearNo: $('#AcademicYearNo').lrselectGet(),
+            Semester: $('#Semester').lrselectGet(),
+            PlanType: $('#PlanType').lrselectGet()
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/GenerateForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

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

@@ -86,9 +86,31 @@ var bootstrap = function ($, learun) {
             });
             //  生成排考名单
             $('#lr_generate').on('click', function () {
+                learun.layerForm({
+                    id: 'form_clear',
+                    title: '生成排考名单',
+                    url: top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/GenerateForm',
+                    width: 500,
+                    height: 300,
+                    btn: ['确定', '关闭'],
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
             });
             //  清除排考名单
             $('#lr_cleargenerate').on('click', function () {
+                learun.layerForm({
+                    id: 'form_generate',
+                    title: '清除排考名单',
+                    url: top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/GenerateForm',
+                    width: 500,
+                    height: 300,
+                    btn: ['确定', '关闭'],
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
             });
             //  安排考试
             $('#lr_planks').on('click',

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

@@ -997,6 +997,9 @@
     <Content Include="Areas\EducationalAdministration\Views\EvaViolationOfDiscipline\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\EvaViolationOfDiscipline\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlanLesson\FormClass.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamLesson\FormImport.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlan\ClearForm.js" />
+    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlan\GenerateForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\Exam_ExamRoom\Form.js" />
     <Content Include="Areas\EducationalAdministration\Views\Exam_ExamRoom\FormYearSemester.js" />
     <Content Include="Areas\EducationalAdministration\Views\Exam_ExamRoom\Index.js" />
@@ -7650,6 +7653,8 @@
     <Content Include="Areas\EducationalAdministration\Views\Exam_ExamRoom\FormYearSemester.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Exam_ExamRoom\Index.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlanLesson\FormClass.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlan\ClearForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\Exam_ExamPlan\GenerateForm.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanBLL.cs

@@ -119,6 +119,56 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 清空
+        /// </summary>
+        /// <param name="AcademicYearNo"></param>
+        /// <param name="Semester"></param>
+        /// <param name="PlanType"></param>
+        /// <returns></returns>
+        public int ClaerForm(string AcademicYearNo, string Semester, string PlanType)
+        {
+            try
+            {
+                return exam_ExamPlanService.ClaerForm(AcademicYearNo, Semester, PlanType);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+        /// <summary>
+        /// 生成
+        /// </summary>
+        /// <param name="AcademicYearNo"></param>
+        /// <param name="Semester"></param>
+        /// <param name="PlanType"></param>
+        /// <returns></returns>
+        public int GenerateForm(string AcademicYearNo, string Semester, string PlanType)
+        {
+            try
+            {
+                return exam_ExamPlanService.GenerateForm(AcademicYearNo, Semester, PlanType);
+            }
+            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/Exam_ExamPlan/Exam_ExamPlanIBLL.cs

@@ -42,6 +42,27 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         void SaveEntity(string keyValue, Exam_ExamPlanEntity entity);
+
+        /// <summary>
+        /// 清空
+        /// </summary>
+        /// <param name="AcademicYearNo"></param>
+        /// <param name="Semester"></param>
+        /// <param name="PlanType"></param>
+        /// <returns></returns>
+        int ClaerForm(string AcademicYearNo, string Semester, string PlanType);
+        /// <summary>
+        /// 生成
+        /// </summary>
+        /// <param name="AcademicYearNo"></param>
+        /// <param name="Semester"></param>
+        /// <param name="PlanType"></param>
+        /// <returns></returns>
+        int GenerateForm(string AcademicYearNo, string Semester, string PlanType);
+
+
+
+
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs

@@ -50,12 +50,12 @@ 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["PlanName"].IsEmpty())
@@ -65,7 +65,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
                 if (!queryParam["PlanType"].IsEmpty())
                 {
-                    dp.Add("PlanType",queryParam["PlanType"].ToString(), DbType.String);
+                    dp.Add("PlanType", queryParam["PlanType"].ToString(), DbType.String);
                     strSql.Append(" AND t.PlanType = @PlanType ");
                 }
                 if (!queryParam["PlanCode"].IsEmpty())
@@ -75,15 +75,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
                 if (!queryParam["EPRandom"].IsEmpty())
                 {
-                    dp.Add("EPRandom",queryParam["EPRandom"].ToString(), DbType.String);
+                    dp.Add("EPRandom", queryParam["EPRandom"].ToString(), DbType.String);
                     strSql.Append(" AND t.EPRandom = @EPRandom ");
                 }
                 if (!queryParam["EPGenarate"].IsEmpty())
                 {
-                    dp.Add("EPGenarate",queryParam["EPGenarate"].ToString(), DbType.String);
+                    dp.Add("EPGenarate", queryParam["EPGenarate"].ToString(), DbType.String);
                     strSql.Append(" AND t.EPGenarate = @EPGenarate ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<Exam_ExamPlanEntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository("CollegeMIS").FindList<Exam_ExamPlanEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -134,7 +134,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<Exam_ExamPlanEntity>(t=>t.EPId == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<Exam_ExamPlanEntity>(t => t.EPId == keyValue);
             }
             catch (Exception ex)
             {
@@ -182,6 +182,59 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        /// <summary>
+        /// 清空
+        /// </summary>
+        /// <param name="AcademicYearNo"></param>
+        /// <param name="Semester"></param>
+        /// <param name="PlanType"></param>
+        /// <returns></returns>
+        public int ClaerForm(string AcademicYearNo, string Semester, string PlanType)
+        {
+            try
+            {
+                string sql = "";
+                return this.BaseRepository("CollegeMIS").ExecuteBySql(sql);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 生成
+        /// </summary>
+        /// <param name="AcademicYearNo"></param>
+        /// <param name="Semester"></param>
+        /// <param name="PlanType"></param>
+        /// <returns></returns>
+        public int GenerateForm(string AcademicYearNo, string Semester, string PlanType)
+        {
+            try
+            {
+                string sql = "";
+                return this.BaseRepository("CollegeMIS").Insert(sql);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion
 
     }