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

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

@@ -26,6 +26,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  视图功能
 
@@ -115,6 +116,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();
         }
         /// <summary>
@@ -124,6 +136,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();
         }
         /// <summary>
@@ -133,6 +156,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();
         }
         /// <summary>
@@ -142,6 +176,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();
         }
         /// <summary>

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();
         }
         /// <summary>
@@ -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();
         }
         /// <summary>

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();
         }
         /// <summary>
@@ -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();
         }
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.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 {
@@ -83,7 +84,7 @@
                         <div class="btn-group btn-group-sm">
                             <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">
+                        <div class=" btn-group btn-group-sm" learun-authorize="yes" id="btnBox">
                             <a id="lr_input" class="btn btn-default"><i class="fa fa-edit">&nbsp;开始录入</i></a>
                             <a id="lr_save" class="btn btn-default" style="display:none;"><i class="fa fa-edit">&nbsp;提交成绩</i></a>
                             <a id="lr_check" class="btn btn-default"><i class="fa fa-lock">&nbsp;提交教务处</i></a>
@@ -112,3 +113,9 @@
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.js")
+<script>
+    var CanInputFlag = "@ViewBag.CanInputFlag";
+    if (CanInputFlag != "True") {
+        top.learun.layerConfirm('当前时间不是成绩录入时间！', function (res) {});
+    }
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.js

@@ -600,6 +600,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 == "") {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.cshtml

@@ -113,3 +113,9 @@
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js")
+<script>
+    var CanInputFlag = "@ViewBag.CanInputFlag";
+    if (CanInputFlag != "True") {
+        top.learun.layerConfirm('当前时间不是成绩录入时间！', function (res) {});
+    }
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js

@@ -604,6 +604,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 == "") {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElective.cshtml

@@ -115,3 +115,9 @@
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElective.js")
+<script>
+    var CanInputFlag = "@ViewBag.CanInputFlag";
+    if (CanInputFlag != "True") {
+        top.learun.layerConfirm('当前时间不是选修成绩录入时间！', function (res) {});
+    }
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElective.js

@@ -618,6 +618,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 == "") {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.cshtml

@@ -115,3 +115,9 @@
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.js")
+<script>
+    var CanInputFlag = "@ViewBag.CanInputFlag";
+    if (CanInputFlag != "True") {
+        top.learun.layerConfirm('当前时间不是选修成绩录入时间！', function (res) {});
+    }
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexOfElectiveInTeacher.js

@@ -621,6 +621,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 == "") {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.cshtml

@@ -108,3 +108,9 @@
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.js")
+<script>
+    var CanInputFlag = "@ViewBag.CanInputFlag";
+    if (CanInputFlag != "True") {
+        top.learun.layerConfirm('当前时间不是补考成绩录入时间！', function (res) {});
+    }
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.js

@@ -520,6 +520,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 == "") {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.cshtml

@@ -108,3 +108,9 @@
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js")
+<script>
+    var CanInputFlag = "@ViewBag.CanInputFlag";
+    if (CanInputFlag != "True") {
+        top.learun.layerConfirm('当前时间不是补考成绩录入时间！', function (res) {});
+    }
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js

@@ -483,6 +483,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 == "") {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndex.cshtml

@@ -110,3 +110,9 @@
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndex.js")
+<script>
+    var CanInputFlag = "@ViewBag.CanInputFlag";
+    if (CanInputFlag != "True") {
+        top.learun.layerConfirm('当前时间不是重考成绩录入时间！', function (res) {});
+    }
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndex.js

@@ -483,6 +483,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 == "") {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.cshtml

@@ -108,3 +108,9 @@
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js")
+<script>
+    var CanInputFlag = "@ViewBag.CanInputFlag";
+    if (CanInputFlag != "True") {
+        top.learun.layerConfirm('当前时间不是重考成绩录入时间！', function (res) {});
+    }
+</script>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPassTwo/InputScoreIndexInTeacher.js

@@ -483,6 +483,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 == "") {

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
             }
         }
 
+        /// <summary>
+        /// 获取EADateArrange表实体数据
+        /// <param name="name">工作名称</param>
+        /// <summary>
+        /// <returns></returns>
+        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  提交数据

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
         /// <summary>
         /// <returns></returns>
         EADateArrangeEntity GetEADateArrangeEntity(string keyValue);
+
+        /// <summary>
+        /// 获取EADateArrange表实体数据
+        /// <param name="name">工作名称</param>
+        /// <summary>
+        /// <returns></returns>
+        EADateArrangeEntity GetEADateArrangeEntityByName(string name);
         #endregion
 
         #region  提交数据

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
             }
         }
 
+        /// <summary>
+        /// 获取EADateArrange表实体数据
+        /// <param name="name">工作名称</param>
+        /// <summary>
+        /// <returns></returns>
+        public EADateArrangeEntity GetEADateArrangeEntityByName(string name)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<EADateArrangeEntity>(x => x.WorkName == name);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region  提交数据
@@ -339,7 +363,7 @@ where s.lessonsortno='1'
 ) as bb
 where bb.EmpNo not in 
 (select a.EmpNo from EmpReportCard a where a.AcademicYearNo=bb.AcademicYearNo and a.Semester=bb.Semester and a.LessonNo=bb.LessonNo and a.ClassNo=bb.ClassNo and a.LessonSortNo=bb.LessonSortNo and a.LessonSortNo='1'  and a.F_SchoolId=bb.F_SchoolId 
-and a.Academicyearno='" + entity.AcademicYearNo + "' and a.Semester='" + entity.Semester + "') and bb.AcademicYearNo='" + entity.AcademicYearNo + "' and bb.Semester='" + entity.Semester + "' and bb.F_SchoolId='"+entity.F_SchoolId+"' order by bb.EmpNo";
+and a.Academicyearno='" + entity.AcademicYearNo + "' and a.Semester='" + entity.Semester + "') and bb.AcademicYearNo='" + entity.AcademicYearNo + "' and bb.Semester='" + entity.Semester + "' and bb.F_SchoolId='" + entity.F_SchoolId + "' order by bb.EmpNo";
                     BaseRepository("CollegeMIS").ExecuteBySql(sql3);
                 }
                 //选修课
@@ -374,7 +398,7 @@ where s.lessonsortno='2'
 ) as bb
 where bb.EmpNo not in 
 (select a.EmpNo from EmpReportCard a where a.AcademicYearNo=bb.AcademicYearNo and a.Semester=bb.Semester and a.LessonNo=bb.LessonNo and a.LessonSection=bb.LessonSection and a.ClassRoomNo=bb.ClassRoomNo and a.LessonSortNo=bb.LessonSortNo and a.LessonSortNo='2' and a.F_SchoolId=bb.F_SchoolId  
-and a.Academicyearno='" + entity.AcademicYearNo + "' and a.Semester='" + entity.Semester + "') and bb.AcademicYearNo='" + entity.AcademicYearNo + "' and bb.Semester='" + entity.Semester + "' and bb.F_SchoolId='"+entity.F_SchoolId+"' order by bb.EmpNo";
+and a.Academicyearno='" + entity.AcademicYearNo + "' and a.Semester='" + entity.Semester + "') and bb.AcademicYearNo='" + entity.AcademicYearNo + "' and bb.Semester='" + entity.Semester + "' and bb.F_SchoolId='" + entity.F_SchoolId + "' order by bb.EmpNo";
                     BaseRepository("CollegeMIS").ExecuteBySql(sql3OfElective);
                 }
             }