From 21c54f2e46ede9f577e340ba52fa68d5446861c0 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Fri, 7 May 2021 09:18:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E5=8E=86=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/SchoolCalendarController.cs | 86 +++++++++- .../Views/SchoolCalendar/Form.cshtml | 10 +- .../Views/SchoolCalendar/Form.js | 19 ++- .../Views/SchoolCalendar/ScheduleIndex.cshtml | 158 ++++++++++++++++++ .../Learun.Application.Web.csproj | 1 + .../SchoolCalendar/SchoolCalendarBLL.cs | 43 +++++ .../SchoolCalendar/SchoolCalendarIBLL.cs | 12 ++ .../SchoolCalendar/SchoolCalendarService.cs | 52 +++++- 8 files changed, 367 insertions(+), 14 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/ScheduleIndex.cshtml diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SchoolCalendarController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SchoolCalendarController.cs index 249f1d643..418eb4fdd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SchoolCalendarController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/SchoolCalendarController.cs @@ -3,6 +3,7 @@ using System.Data; using Learun.Application.TwoDevelopment.EducationalAdministration; using System.Web.Mvc; using System.Collections.Generic; +using System.Collections; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -26,7 +27,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult Index() { - return View(); + return View(); } /// /// 表单页 @@ -35,8 +36,19 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult Form() { - return View(); + return View(); } + + /// + /// 日程管理 + /// + /// + [HttpGet] + public ActionResult ScheduleIndex() + { + return View(); + } + #endregion #region 获取数据 @@ -74,6 +86,29 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers var data = schoolCalendarIBLL.GetList(queryJson); return Success(data); } + /// + /// 获取日程数据 + /// + /// + [HttpGet] + public ActionResult GetListForSchedule() + { + var userInfo = LoginUserInfo.Get(); + List data = new List(); + foreach (SchoolCalendarEntity entity in schoolCalendarIBLL.GetList()) + { + Hashtable ht = new Hashtable(); + ht["id"] = entity.ID; + ht["academicYearNo"] = "【" + entity.AcademicYearNo + "】"; + ht["title"] = entity.Content; + ht["end"] = (entity.EndTime.ToDate().ToString("yyyy-MM-dd") + " " + entity.EndTime.ToString().Substring(0, 2) + ":" + entity.EndTime.ToString().Substring(2, 2)).ToDate().ToString("yyyy-MM-dd HH:mm:ss"); + ht["start"] = (entity.StartTime.ToDate().ToString("yyyy-MM-dd") + " " + entity.StartTime.ToString().Substring(0, 2) + ":" + entity.StartTime.ToString().Substring(2, 2)).ToDate().ToString("yyyy-MM-dd HH:mm:ss"); + ht["allDay"] = false; + data.Add(ht); + } + return ToJsonResult(data); + } + /// /// 获取表单数据 /// @@ -82,8 +117,9 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [AjaxOnly] public ActionResult GetFormData(string keyValue) { - var SchoolCalendarData = schoolCalendarIBLL.GetSchoolCalendarEntity( keyValue ); - var jsonData = new { + var SchoolCalendarData = schoolCalendarIBLL.GetSchoolCalendarEntity(keyValue); + var jsonData = new + { SchoolCalendar = SchoolCalendarData, }; return Success(jsonData); @@ -114,11 +150,49 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [AjaxOnly] public ActionResult SaveForm(string keyValue, string strEntity) { - UserInfo userInfo = LoginUserInfo.Get(); SchoolCalendarEntity entity = strEntity.ToObject(); - schoolCalendarIBLL.SaveEntity(userInfo,keyValue,entity); + UserInfo userInfo = LoginUserInfo.Get(); + SchoolCalendarEntity entity = strEntity.ToObject(); + //根据学年和学期查询 + var model = schoolCalendarIBLL.GetSchoolCalendarEntityByNo(entity.AcademicYearNo, entity.Semester); + if (string.IsNullOrEmpty(keyValue)) + { + if (model != null) + { + return Fail("当前学期已存在！"); + } + } + else + { + if (model != null && model.ID != keyValue) + { + return Fail("当前学期已存在！"); + } + } + schoolCalendarIBLL.SaveEntity(userInfo, keyValue, entity); return Success("保存成功！"); } #endregion + #region 扩展数据 + /// + /// 学年 + /// + /// + [HttpGet] + public ActionResult GenerateNearByAcademic() + { + return Success(Learun.Util.WebHelper.GenerateNearByAcademic()); + } + /// + /// 学期 + /// + /// + [HttpGet] + public ActionResult GenerateNearBySemeter() + { + return Success(Learun.Util.WebHelper.GenerateNearBySemeter()); + } + #endregion + } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.cshtml index 2fd75c575..f4aa3e788 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.cshtml @@ -3,13 +3,21 @@ Layout = "~/Views/Shared/_Form.cshtml"; }
-
+ @*
学年
学期
+
*@ +
+
学年*
+
+
+
+
学期*
+
开始日期
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.js index 3b28a6b2d..f08799931 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/Form.js @@ -15,8 +15,22 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $("#Semester").lrDataItemSelect({ code: 'Semester' }); - + //学年 + $('#AcademicYearNo').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/SchoolCalendar/GenerateNearByAcademic', + value: 'value', + text: 'text' + }); + //学期 + $('#Semester').lrselect({ + placeholder: "请选择学年", + allowSearch: true, + url: top.$.rootUrl + '/EducationalAdministration/SchoolCalendar/GenerateNearBySemeter', + value: 'value', + text: 'text' + }); }, initData: function () { if (!!keyValue) { @@ -46,6 +60,7 @@ var bootstrap = function ($, learun) { if (!!callBack) { callBack(); } + learun.frameTab.currentIframe().location.reload(); }); }; page.init(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/ScheduleIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/ScheduleIndex.cshtml new file mode 100644 index 000000000..7d3abb0fd --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/SchoolCalendar/ScheduleIndex.cshtml @@ -0,0 +1,158 @@ + + + + + + 日程管理 + + + + + @Html.AppendCssFile( + "/Views/LR_Content/style/lr-common.css", + "/Views/LR_Content/style/lr-iframe-index.css" + ) + + + + +
+
+
+ + 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 29e7f4d12..c0e68b41c 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 @@ -7120,6 +7120,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarBLL.cs index 8567cd653..4b10d7998 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarBLL.cs @@ -67,6 +67,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 获取列表 + /// + /// 返回列表 + public IEnumerable GetList() + { + try + { + return schoolCalendarService.GetList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + /// /// 获取SchoolCalendar表实体数据 /// 主键 @@ -91,6 +114,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + + public SchoolCalendarEntity GetSchoolCalendarEntityByNo(string academicYearNo,string semester) + { + try + { + return schoolCalendarService.GetSchoolCalendarEntityByNo(academicYearNo, semester); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } #endregion #region 提交数据 @@ -143,6 +185,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarIBLL.cs index a17ed9417..217600cd1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarIBLL.cs @@ -23,6 +23,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// IEnumerable GetPageList(Pagination pagination, string queryJson); /// + /// 获取列表 + /// + /// 返回列表 + IEnumerable GetList(); + /// /// 获取页面显示列表数据 /// /// 查询参数 @@ -34,6 +39,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// SchoolCalendarEntity GetSchoolCalendarEntity(string keyValue); + + /// + /// 根据学年获取SchoolCalendar表实体数据 + /// 主键 + /// + /// + SchoolCalendarEntity GetSchoolCalendarEntityByNo(string academicYearNo,string semester); #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarService.cs index 2ba4e5aff..ad3edc968 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/SchoolCalendar/SchoolCalendarService.cs @@ -54,7 +54,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("Semester", "%" + queryParam["Semester"].ToString() + "%", DbType.String); strSql.Append(" AND t.Semester Like @Semester "); } - return this.BaseRepository().FindList(strSql.ToString(),dp, pagination); + return this.BaseRepository().FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) { @@ -103,7 +103,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("Semester", "%" + queryParam["Semester"].ToString() + "%", DbType.String); strSql.Append(" AND t.Semester Like @Semester "); } - return this.BaseRepository().FindList(strSql.ToString(),dp); + return this.BaseRepository().FindList(strSql.ToString(), dp); } catch (Exception ex) { @@ -118,6 +118,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 获取列表 + /// + /// 返回列表 + public IEnumerable GetList() + { + try + { + return this.BaseRepository().FindList(); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + throw; + else + throw ExceptionEx.ThrowServiceException(ex); + } + } + /// /// 获取SchoolCalendar表实体数据 /// 主键 @@ -142,6 +161,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 获取SchoolCalendar表实体数据 + /// 主键 + /// + /// + public SchoolCalendarEntity GetSchoolCalendarEntityByNo(string academicYearNo, string semester) + { + try + { + return this.BaseRepository().FindEntity(x => x.AcademicYearNo == academicYearNo && x.Semester == semester); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } #endregion #region 提交数据 @@ -155,7 +197,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - this.BaseRepository().Delete(t=>t.ID == keyValue); + this.BaseRepository().Delete(t => t.ID == keyValue); } catch (Exception ex) { @@ -175,13 +217,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 主键 /// /// - public void SaveEntity( UserInfo userInfo, string keyValue, SchoolCalendarEntity entity) + public void SaveEntity(UserInfo userInfo, string keyValue, SchoolCalendarEntity entity) { try { if (!string.IsNullOrEmpty(keyValue)) { - entity.Modify(keyValue,userInfo); + entity.Modify(keyValue, userInfo); this.BaseRepository().Update(entity); } else