From 93c79eaf9976f73a4767f5f5ff3863ac07c35fdd Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Tue, 14 Jun 2022 15:28:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=80=83=E8=AE=B0=E5=BD=95--=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E5=AE=89=E6=8E=92=E8=80=83=E5=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Exam_ExamPlanController.cs | 19 +++++++ .../Views/Exam_ExamPlan/Index.js | 15 ++++++ .../Exam_ExamPlanRoom/Exam_ExamPlanRoomBLL.cs | 21 +++++++- .../Exam_ExamPlanRoomIBLL.cs | 1 + .../Exam_ExamPlanRoomService.cs | 51 ++++++++++++++++++- 5 files changed, 105 insertions(+), 2 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs index 0399d666e..9a8722fa3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs @@ -21,6 +21,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers private Exam_ExamPlanIBLL exam_ExamPlanIBLL = new Exam_ExamPlanBLL(); private Exam_ExamPlanLessonIBLL exam_ExamPlanLessonIBLL = new Exam_ExamPlanLessonBLL(); private Exam_ExamPlanClassIBLL exam_ExamPlanClassIBLL = new Exam_ExamPlanClassBLL(); + private Exam_ExamPlanRoomIBLL exam_ExamPlanRoomIBLL = new Exam_ExamPlanRoomBLL(); #region 视图功能 @@ -321,6 +322,24 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success("操作成功！"); } + /// + /// 一键安排考场 + /// + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult PlanRoomByEPId(string keyValue) + { + var res = exam_ExamPlanRoomIBLL.PlanRoomByEPId(keyValue); + if (!res.flag) + { + return Fail(res.str); + } + + return Success("操作成功！"); + } + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js index bb5017349..95948ea43 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.js @@ -193,6 +193,21 @@ var bootstrap = function ($, learun) { } }); + //一键安排考场 + $('#lr_examroom').on('click', + function () { + var keyValue = $('#gridtable').jfGridValue('EPId'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认安排考场！', function (res) { + if (res) { + learun.postForm(top.$.rootUrl + '/EducationalAdministration/Exam_ExamPlan/PlanRoomByEPId', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); + //自动生成排考时间 $('#lr_examlessontime').on('click', function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoom/Exam_ExamPlanRoomBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoom/Exam_ExamPlanRoomBLL.cs index b6afaf0d3..5be5c89e9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoom/Exam_ExamPlanRoomBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoom/Exam_ExamPlanRoomBLL.cs @@ -130,7 +130,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } - + /// /// 保存实体数据（新增、修改） @@ -175,6 +175,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + + public (bool flag, string str) PlanRoomByEPId(string EPId) + { + try + { + return exam_ExamPlanRoomService.PlanRoomByEPId(EPId); + } + 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/Exam_ExamPlanRoom/Exam_ExamPlanRoomIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoom/Exam_ExamPlanRoomIBLL.cs index 21f15eed4..cc7bc85cb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoom/Exam_ExamPlanRoomIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoom/Exam_ExamPlanRoomIBLL.cs @@ -47,6 +47,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 实体 void SaveEntity(string keyValue, Exam_ExamPlanRoomEntity entity); void SaveList (List list); + (bool flag,string str) PlanRoomByEPId(string EPId); #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoom/Exam_ExamPlanRoomService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoom/Exam_ExamPlanRoomService.cs index 7a9c0aa77..25cff5d35 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoom/Exam_ExamPlanRoomService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoom/Exam_ExamPlanRoomService.cs @@ -128,7 +128,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - return this.BaseRepository("CollegeMIS").FindList(x => x.EPLId == EPLId && x.ClassroomNo == ClassroomNo).Count() > 0 ? true : false; + return this.BaseRepository("CollegeMIS").FindList(x => x.EPLId == EPLId && x.ClassroomNo == ClassroomNo).Count() > 0 ? true : false; } catch (Exception ex) { @@ -269,6 +269,55 @@ where l.EPLId='{EPLId}'"; } } } + + /// + /// 自动安排考场 + /// + /// 考试记录表Id + /// + public (bool flag, string str) PlanRoomByEPId(string EPId) + { + var db = this.BaseRepository("CollegeMIS"); + try + { + db.BeginTrans(); + /* + * 1.查询是否已添加考试课程和班级 + * 2.查询是否生成课程排考时间 + * 3.查询考试课程并循环， + * 根据考试课程的总班级人数和排考时间，随机安排考场（同一时间段考场不能重复） + */ + //考试记录表 + var examPlan = db.FindEntity(EPId); + //考试课程 + var examLessonList = db.FindList(x => x.EPId == EPId).ToList(); + if (examLessonList.Count() <= 0) + { + return (false, "请先添加考试课程！"); + } + if (!examLessonList.Exists(x => x.ExamDate != null)) + { + return (false, "请先设置排考时间！"); + } + //考试班级 + + + + db.Commit(); + } + catch (Exception ex) + { + db.Rollback(); + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } #endregion }