From 408844f34183383a4e56f639dc033957ab069238 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Mon, 7 Aug 2023 10:05:10 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=88=90?= =?UTF-8?q?=E7=BB=A9=E5=BD=95=E5=85=A5=EF=BC=9A=E5=A2=9E=E5=8A=A0=20?= =?UTF-8?q?=E2=80=9C=E6=95=99=E5=AD=A6=E5=B7=A5=E4=BD=9C=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E2=80=9D=20=E4=B8=AD=E5=AF=B9=E5=BA=94=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E7=9A=84=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=9A=84=E9=99=90=E5=88=B6=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuScoreController.cs | 46 +++++++++++++++++ .../Controllers/StuScoreNotPassController.cs | 23 +++++++++ .../StuScoreNotPassTwoController.cs | 23 +++++++++ .../Views/StuScore/InputScoreIndex.cshtml | 6 +++ .../Views/StuScore/InputScoreIndex.js | 5 ++ .../StuScore/InputScoreIndexInTeacher.cshtml | 7 +++ .../StuScore/InputScoreIndexInTeacher.js | 5 ++ .../StuScore/InputScoreIndexOfElective.cshtml | 51 +++++++++++-------- .../StuScore/InputScoreIndexOfElective.js | 5 ++ .../InputScoreIndexOfElectiveInTeacher.cshtml | 51 +++++++++++-------- .../InputScoreIndexOfElectiveInTeacher.js | 5 ++ .../StuScoreNotPass/InputScoreIndex.cshtml | 6 +++ .../Views/StuScoreNotPass/InputScoreIndex.js | 5 ++ .../InputScoreIndexInTeacher.cshtml | 9 ++++ .../InputScoreIndexInTeacher.js | 5 ++ .../StuScoreNotPassTwo/InputScoreIndex.cshtml | 7 +++ .../StuScoreNotPassTwo/InputScoreIndex.js | 5 ++ .../InputScoreIndexInTeacher.cshtml | 9 ++++ .../InputScoreIndexInTeacher.js | 5 ++ .../EADateArrange/EADateArrangeBLL.cs | 24 +++++++++ .../EADateArrange/EADateArrangeIBLL.cs | 7 +++ .../EADateArrange/EADateArrangeService.cs | 24 +++++++++ 22 files changed, 289 insertions(+), 44 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs index d5e16926b..fe51564fd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreController.cs @@ -25,6 +25,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL(); private CdMajorIBLL cdMajorIBLL = new CdMajorBLL(); private UserIBLL userIBLL = new UserBLL(); + private EADateArrangeIBLL eADateArrangeIBLL = new EADateArrangeBLL(); #region 视图功能 @@ -114,6 +115,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult InputScoreIndex() { + //获取“教学工作安排”中“成绩录入”的记录 + var entity = eADateArrangeIBLL.GetEADateArrangeEntityByName("成绩录入"); + if (entity != null && entity.CheckMark == "1" && DateTime.Now > entity.MakeDate && DateTime.Now < entity.EndDate) + { + ViewBag.CanInputFlag = true;//可以录入成绩标识 + } + else + { + ViewBag.CanInputFlag = false; + } + return View(); } /// @@ -123,6 +135,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult InputScoreIndexInTeacher() { + //获取“教学工作安排”中“成绩录入”的记录 + var entity = eADateArrangeIBLL.GetEADateArrangeEntityByName("成绩录入"); + if (entity != null && entity.CheckMark == "1" && DateTime.Now > entity.MakeDate && DateTime.Now < entity.EndDate) + { + ViewBag.CanInputFlag = true;//可以录入成绩标识 + } + else + { + ViewBag.CanInputFlag = false; + } + return View(); } /// @@ -132,6 +155,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult InputScoreIndexOfElective() { + //获取“教学工作安排”中“成绩录入”的记录 + var entity = eADateArrangeIBLL.GetEADateArrangeEntityByName("选修成绩录入"); + if (entity != null && entity.CheckMark == "1" && DateTime.Now > entity.MakeDate && DateTime.Now < entity.EndDate) + { + ViewBag.CanInputFlag = true;//可以录入成绩标识 + } + else + { + ViewBag.CanInputFlag = false; + } + return View(); } /// @@ -141,6 +175,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult InputScoreIndexOfElectiveInTeacher() { + + //获取“教学工作安排”中“成绩录入”的记录 + var entity = eADateArrangeIBLL.GetEADateArrangeEntityByName("选修成绩录入"); + if (entity != null && entity.CheckMark == "1" && DateTime.Now > entity.MakeDate && DateTime.Now < entity.EndDate) + { + ViewBag.CanInputFlag = true;//可以录入成绩标识 + } + else + { + ViewBag.CanInputFlag = false; + } + return View(); } /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs index 3ea5c5236..0385c0559 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassController.cs @@ -22,6 +22,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { private StuScoreNotPassIBLL stuScoreNotPassIBLL = new StuScoreNotPassBLL(); private UserIBLL userIBLL = new UserBLL(); + private EADateArrangeIBLL eADateArrangeIBLL = new EADateArrangeBLL(); #region 视图功能 @@ -51,6 +52,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult InputScoreIndex() { + //获取“教学工作安排”中“补考成绩录入”的记录 + var entity = eADateArrangeIBLL.GetEADateArrangeEntityByName("补考成绩录入"); + if (entity != null && entity.CheckMark == "1" && DateTime.Now > entity.MakeDate && DateTime.Now < entity.EndDate) + { + ViewBag.CanInputFlag = true;//可以录入成绩标识 + } + else + { + ViewBag.CanInputFlag = false; + } + return View(); } /// @@ -60,6 +72,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult InputScoreIndexInTeacher() { + //获取“教学工作安排”中“补考成绩录入”的记录 + var entity = eADateArrangeIBLL.GetEADateArrangeEntityByName("补考成绩录入"); + if (entity != null && entity.CheckMark == "1" && DateTime.Now > entity.MakeDate && DateTime.Now < entity.EndDate) + { + ViewBag.CanInputFlag = true;//可以录入成绩标识 + } + else + { + ViewBag.CanInputFlag = false; + } + return View(); } /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassTwoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassTwoController.cs index 8eec54f49..aa9514a5d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassTwoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuScoreNotPassTwoController.cs @@ -22,6 +22,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { private StuScoreNotPassTwoIBLL stuScoreNotPassTwoIBLL = new StuScoreNotPassTwoBLL(); private UserIBLL userIBLL = new UserBLL(); + private EADateArrangeIBLL eADateArrangeIBLL = new EADateArrangeBLL(); #region 视图功能 @@ -50,6 +51,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult InputScoreIndex() { + //获取“教学工作安排”中“重考成绩录入”的记录 + var entity = eADateArrangeIBLL.GetEADateArrangeEntityByName("重考成绩录入"); + if (entity != null && entity.CheckMark == "1" && DateTime.Now > entity.MakeDate && DateTime.Now < entity.EndDate) + { + ViewBag.CanInputFlag = true;//可以录入成绩标识 + } + else + { + ViewBag.CanInputFlag = false; + } + return View(); } /// @@ -59,6 +71,17 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers [HttpGet] public ActionResult InputScoreIndexInTeacher() { + //获取“教学工作安排”中“重考成绩录入”的记录 + var entity = eADateArrangeIBLL.GetEADateArrangeEntityByName("重考成绩录入"); + if (entity != null && entity.CheckMark == "1" && DateTime.Now > entity.MakeDate && DateTime.Now < entity.EndDate) + { + ViewBag.CanInputFlag = true;//可以录入成绩标识 + } + else + { + ViewBag.CanInputFlag = false; + } + return View(); } /// diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.cshtml index e53f22674..7c4334514 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.cshtml @@ -112,3 +112,9 @@ @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.js") + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.js index 6ead81c74..0c6d72af4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.js @@ -576,6 +576,11 @@ var bootstrap = function ($, learun) { } }; judgeSelect = function () { + if (CanInputFlag != "True") { + top.learun.layerConfirm('当前时间不是成绩录入时间！', function (res) { }); + return false; + } + var $content = $('body').find('.lr-layout-tool-left'); var query = $content.lrGetFormData(); if (query.F_SchoolId == null || query.F_SchoolId == "") { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.cshtml index 922eab34b..83e9fedca 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.cshtml @@ -38,6 +38,7 @@ float: right; padding-right: 30px; } + .scaleRow .tipBox { display: inline-block; color: #ff0000; @@ -113,3 +114,9 @@ @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js") + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js index b0e0da3de..d700627ba 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js @@ -577,6 +577,11 @@ var bootstrap = function ($, learun) { } }; judgeSelect = function () { + if (CanInputFlag != "True") { + top.learun.layerConfirm('当前时间不是成绩录入时间！', function (res) { }); + return false; + } + var $content = $('body').find('.lr-layout-tool-left'); var query = $content.lrGetFormData(); if (query.F_SchoolId == null || query.F_SchoolId == "") { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElective.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElective.cshtml index e3518690a..acab77142 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElective.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElective.cshtml @@ -38,10 +38,11 @@ float: right; padding-right: 30px; } - .scaleRow .tipBox{ - display:inline-block; - color:#ff0000; - margin-left:10px; + + .scaleRow .tipBox { + display: inline-block; + color: #ff0000; + margin-left: 10px; } #addMinutesBtn { @@ -87,31 +88,37 @@ @*
-  开始录入 - -  提交教务处 -  去审核成绩 -  设置成绩比例 -
*@ +  开始录入 + +  提交教务处 +  去审核成绩 +  设置成绩比例 + *@ @*
- 比例设置： - 平时成绩占比 0 %， - 期中成绩占比 0 %， - 期末成绩占比 0 %， - 其他成绩占比 0 % -
提示：录入完成后，请务必点击“提交成绩”按钮，避免成绩丢失！
- -
*@ + 比例设置： + 平时成绩占比 0 %， + 期中成绩占比 0 %， + 期末成绩占比 0 %， + 其他成绩占比 0 % +
提示：录入完成后，请务必点击“提交成绩”按钮，避免成绩丢失！
+ + *@
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElective.js") + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElective.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElective.js index a090a20b0..9d89634df 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElective.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElective.js @@ -594,6 +594,11 @@ var bootstrap = function ($, learun) { } }; judgeSelect = function () { + if (CanInputFlag != "True") { + top.learun.layerConfirm('当前时间不是选修成绩录入时间！', function (res) { }); + return false; + } + var $content = $('body').find('.lr-layout-tool-left'); var query = $content.lrGetFormData(); if (query.F_SchoolId == null || query.F_SchoolId == "") { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.cshtml index 72044bbf9..3fc755dbd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.cshtml @@ -38,10 +38,11 @@ float: right; padding-right: 30px; } - .scaleRow .tipBox{ - display:inline-block; - color:#ff0000; - margin-left:10px; + + .scaleRow .tipBox { + display: inline-block; + color: #ff0000; + margin-left: 10px; } #addMinutesBtn { @@ -87,31 +88,37 @@ @*
-  开始录入 - -  提交教务处 -  去审核成绩 -  设置成绩比例 -
*@ +  开始录入 + +  提交教务处 +  去审核成绩 +  设置成绩比例 + *@ @*
- 比例设置： - 平时成绩占比 0 %， - 期中成绩占比 0 %， - 期末成绩占比 0 %， - 其他成绩占比 0 % -
提示：录入完成后，请务必点击“提交成绩”按钮，避免成绩丢失！
- -
*@ + 比例设置： + 平时成绩占比 0 %， + 期中成绩占比 0 %， + 期末成绩占比 0 %， + 其他成绩占比 0 % +
提示：录入完成后，请务必点击“提交成绩”按钮，避免成绩丢失！
+ + *@
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.js") + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.js index a965be528..d3b1f484e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.js @@ -594,6 +594,11 @@ var bootstrap = function ($, learun) { } }; judgeSelect = function () { + if (CanInputFlag != "True") { + top.learun.layerConfirm('当前时间不是选修成绩录入时间！', function (res) { }); + return false; + } + var $content = $('body').find('.lr-layout-tool-left'); var query = $content.lrGetFormData(); if (query.F_SchoolId == null || query.F_SchoolId == "") { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.cshtml index 87d030286..6afa7e061 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.cshtml @@ -108,3 +108,9 @@ @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.js") + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.js index a3874407a..d54426c5b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.js @@ -459,6 +459,11 @@ var bootstrap = function ($, learun) { } }; judgeSelect = function () { + if (CanInputFlag != "True") { + top.learun.layerConfirm('当前时间不是补考成绩录入时间！', function (res) { }); + return false; + } + var $content = $('body').find('.lr-layout-tool-left'); var query = $content.lrGetFormData(); if (query.F_SchoolId == null || query.F_SchoolId == "") { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.cshtml index 0fb324a54..1931df268 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.cshtml @@ -6,6 +6,7 @@ .lr-select { width: 150px; } + #LessonNo { width: 180px; } @@ -13,6 +14,7 @@ .lr-selectLittle { width: 80px; } + .lr-layout-tool { height: 80px; } @@ -39,6 +41,7 @@ float: right; padding-right: 30px; } + .scaleRow .tipBox { display: inline-block; color: #ff0000; @@ -108,3 +111,9 @@ @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js") + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js index d84b493c0..0f12d216e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js @@ -459,6 +459,11 @@ var bootstrap = function ($, learun) { } }; judgeSelect = function () { + if (CanInputFlag != "True") { + top.learun.layerConfirm('当前时间不是补考成绩录入时间！', function (res) { }); + return false; + } + var $content = $('body').find('.lr-layout-tool-left'); var query = $content.lrGetFormData(); if (query.F_SchoolId == null || query.F_SchoolId == "") { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndex.cshtml index 1992775db..f823463ef 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndex.cshtml @@ -47,6 +47,7 @@ color: #ff0000; margin-left: 10px; } + #addMinutesBtn { display: inline-block; cursor: pointer; @@ -110,3 +111,9 @@ @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndex.js") + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndex.js index e3726b5b8..ade80b906 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndex.js @@ -459,6 +459,11 @@ var bootstrap = function ($, learun) { } }; judgeSelect = function () { + if (CanInputFlag != "True") { + top.learun.layerConfirm('当前时间不是重考成绩录入时间！', function (res) { }); + return false; + } + var $content = $('body').find('.lr-layout-tool-left'); var query = $content.lrGetFormData(); if (query.F_SchoolId == null || query.F_SchoolId == "") { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.cshtml index 76bbc6e7f..94b0d950b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.cshtml @@ -6,6 +6,7 @@ .lr-select { width: 150px; } + #LessonNo { width: 180px; } @@ -13,6 +14,7 @@ .lr-selectLittle { width: 80px; } + .lr-layout-tool { height: 80px; } @@ -45,6 +47,7 @@ color: #ff0000; margin-left: 10px; } + #addMinutesBtn { display: inline-block; cursor: pointer; @@ -108,3 +111,9 @@ @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js") + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js index e3726b5b8..ade80b906 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js @@ -459,6 +459,11 @@ var bootstrap = function ($, learun) { } }; judgeSelect = function () { + if (CanInputFlag != "True") { + top.learun.layerConfirm('当前时间不是重考成绩录入时间！', function (res) { }); + return false; + } + var $content = $('body').find('.lr-layout-tool-left'); var query = $content.lrGetFormData(); if (query.F_SchoolId == null || query.F_SchoolId == "") { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeBLL.cs index 5e8ef2f93..f8038e8b5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeBLL.cs @@ -66,6 +66,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 获取EADateArrange表实体数据 + /// 工作名称 + /// + /// + public EADateArrangeEntity GetEADateArrangeEntityByName(string name) + { + try + { + return eADateArrangeService.GetEADateArrangeEntityByName(name); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeIBLL.cs index d5a8b3439..20a322e6e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeIBLL.cs @@ -27,6 +27,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// EADateArrangeEntity GetEADateArrangeEntity(string keyValue); + + /// + /// 获取EADateArrange表实体数据 + /// 工作名称 + /// + /// + EADateArrangeEntity GetEADateArrangeEntityByName(string name); #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeService.cs index 25207dae6..01565ae86 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeService.cs @@ -107,6 +107,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 获取EADateArrange表实体数据 + /// 工作名称 + /// + /// + public EADateArrangeEntity GetEADateArrangeEntityByName(string name) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(x => x.WorkName == name); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + #endregion #region 提交数据