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

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

@@ -116,6 +116,27 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 
         #region  获取数据
 
+        /// <summary>
+        /// 获取教学安排（根据学年、学期、名称）判断是否可以录入
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetCanInputFlag(string name,string AcademicYearNo,string Semester)
+        {
+            bool CanInputFlag = true;
+            var entity = eADateArrangeIBLL.GetEntityByNameSemester(name, AcademicYearNo, Semester);
+            if (entity != null && entity.CheckMark == "1" && DateTime.Now > entity.MakeDate && DateTime.Now < entity.EndDate)
+            {
+                CanInputFlag = true;//可以录入成绩标识
+            }
+            else
+            {
+                CanInputFlag = false;
+            }
+            return Success(CanInputFlag);
+        }
         /// <summary>
         /// 获取列表数据
         /// <summary>

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

@@ -6,9 +6,11 @@
  */
 
 var selectedRow;
+var CanInputFlagSemester;
 var refreshGirdData;
 var refreshGirdData2;
 var judgeSelect;    //判断下拉框是否选择
+var judgeSelectDetail;    //判断下拉框是否选择
 var modifyDate; //成绩被占用，且是登录用户时，成绩表中的编辑时间；
 var timer;  //计时器
 var submitScoreTimer;   //五分钟提交成绩计时器
@@ -604,10 +606,10 @@ var bootstrap = function ($, learun) {
         }
     };
     judgeSelect = function () {
-        if (CanInputFlag != "True") {
-            top.learun.layerConfirm('当前时间不是成绩录入时间！', function (res) { });
-            return false;
-        }
+        //if (CanInputFlag != "True") {
+        //    top.learun.layerConfirm('当前时间不是成绩录入时间！', function (res) { });
+        //    return false;
+        //}
 
         var $content = $('body').find('.lr-layout-tool-left');
         var query = $content.lrGetFormData();
@@ -623,15 +625,45 @@ var bootstrap = function ($, learun) {
             learun.alert.warning("请选择学期！");
             return false;
         }
-        if (query.LessonNo == null || query.LessonNo == "") {
-            learun.alert.warning("请选择课程！");
-            return false;
-        }
-        if (query.ClassNo == null || query.ClassNo == "") {
-            learun.alert.warning("请选择班级！");
+        $.ajax({
+            url: top.$.rootUrl + '/StuScoreNotPass/GetCanInputFlag?name=成绩录入&AcademicYearNo=' + query.AcademicYearNo + '&Semester=' + query.Semester,
+            type: "GET",
+            dataType: "json",
+            async: false,
+            cache: false,
+            success: function (ref) {
+                if (ref.code == "200" && ref.data === false) {
+                    CanInputFlagSemester = false;
+                    top.learun.layerConfirm('当前时间不是成绩录入时间！', function (res) { });
+                    return false;
+                }
+            },
+            error: function (XMLHttpRequest, textStatus, errorThrown) {
+                learun.httpErrorLog(textStatus);
+            },
+            beforeSend: function () {
+            },
+            complete: function () {
+            }
+        });
+
+        if (!judgeSelectDetail(query)) {
             return false;
         }
         return query;
     };
+    judgeSelectDetail = function (query) {
+        if (CanInputFlagSemester !== false) {
+            if (query.LessonNo == null || query.LessonNo == "") {
+                learun.alert.warning("请选择课程！");
+                return false;
+            }
+            if (query.ClassNo == null || query.ClassNo == "") {
+                learun.alert.warning("请选择班级！");
+                return false;
+            }
+        }
+        return true;
+    };
     page.init();
 }

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

@@ -5,9 +5,11 @@
  * 描  述：全院学生补考成绩录入(新)
  */
 var selectedRow;
+var CanInputFlagSemester;
 var refreshGirdData;
 var refreshGirdData2;
 var judgeSelect;    //判断下拉框是否选择
+var judgeSelectDetail;    //判断下拉框是否选择
 var modifyDate; //成绩被占用，且是登录用户时，成绩表中的编辑时间；
 var timer;  //计时器
 var submitScoreTimer;   //五分钟提交成绩计时器
@@ -422,6 +424,8 @@ var bootstrap = function ($, learun) {
                     $('#Semester').lrselectSet(ref.data.Item3);
                 }
             }.bind(this), "json");
+
+
         },
         initGird: function () {
             $('#gridtable').jfGrid({
@@ -483,11 +487,6 @@ 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 == "") {
@@ -502,15 +501,44 @@ var bootstrap = function ($, learun) {
             learun.alert.warning("请选择学期！");
             return false;
         }
-        if (query.LessonNo == null || query.LessonNo == "") {
-            learun.alert.warning("请选择课程！");
-            return false;
-        }
-        if (query.ClassNo == null || query.ClassNo == "") {
-            learun.alert.warning("请选择班级！");
+        $.ajax({
+            url: top.$.rootUrl + '/StuScoreNotPass/GetCanInputFlag?name=补考成绩录入&AcademicYearNo=' + query.AcademicYearNo + '&Semester=' + query.Semester,
+            type: "GET",
+            dataType: "json",
+            async: false,
+            cache: false,
+            success: function (ref) {
+                if (ref.code == "200" && ref.data === false) {
+                    CanInputFlagSemester = false;
+                    top.learun.layerConfirm('当前时间不是补考成绩录入时间！', function (res) { });
+                    return false;
+                }
+            },
+            error: function (XMLHttpRequest, textStatus, errorThrown) {
+                learun.httpErrorLog(textStatus);
+            },
+            beforeSend: function () {
+            },
+            complete: function () {
+            }
+        });
+        if (!judgeSelectDetail(query)) {
             return false;
         }
         return query;
     };
+    judgeSelectDetail = function (query) {
+        if (CanInputFlagSemester !== false) {
+            if (query.LessonNo == null || query.LessonNo == "") {
+                learun.alert.warning("请选择课程！");
+                return false;
+            }
+            if (query.ClassNo == null || query.ClassNo == "") {
+                learun.alert.warning("请选择班级！");
+                return false;
+            }
+        }
+        return true;
+    };
     page.init();
 }

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

@@ -5,9 +5,11 @@
  * 描  述：全院学生二次补考成绩录入(新)
  */
 var selectedRow;
+var CanInputFlagSemester;
 var refreshGirdData;
 var refreshGirdData2;
 var judgeSelect;    //判断下拉框是否选择
+var judgeSelectDetail;    //判断下拉框是否选择
 var modifyDate; //成绩被占用，且是登录用户时，成绩表中的编辑时间；
 var timer;  //计时器
 var submitScoreTimer;   //五分钟提交成绩计时器
@@ -483,10 +485,10 @@ var bootstrap = function ($, learun) {
         }
     };
     judgeSelect = function () {
-        if (CanInputFlag != "True") {
-            top.learun.layerConfirm('当前时间不是重考成绩录入时间！', function (res) { });
-            return false;
-        }
+        //if (CanInputFlag != "True") {
+        //    top.learun.layerConfirm('当前时间不是重考成绩录入时间！', function (res) { });
+        //    return false;
+        //}
 
         var $content = $('body').find('.lr-layout-tool-left');
         var query = $content.lrGetFormData();
@@ -502,15 +504,46 @@ var bootstrap = function ($, learun) {
             learun.alert.warning("请选择学期！");
             return false;
         }
-        if (query.LessonNo == null || query.LessonNo == "") {
-            learun.alert.warning("请选择课程！");
-            return false;
-        }
-        if (query.ClassNo == null || query.ClassNo == "") {
-            learun.alert.warning("请选择班级！");
+        $.ajax({
+            url: top.$.rootUrl + '/StuScoreNotPass/GetCanInputFlag?name=重考成绩录入&AcademicYearNo=' + query.AcademicYearNo + '&Semester=' + query.Semester,
+            type: "GET",
+            dataType: "json",
+            async: false,
+            cache: false,
+            success: function (ref) {
+                if (ref.code == "200" && ref.data === false) {
+                    CanInputFlagSemester = false;
+                    top.learun.layerConfirm('当前时间不是重考成绩录入时间！', function (res) { });
+                    return false;
+                }
+            },
+            error: function (XMLHttpRequest, textStatus, errorThrown) {
+                learun.httpErrorLog(textStatus);
+            },
+            beforeSend: function () {
+            },
+            complete: function () {
+            }
+        });
+
+        if (!judgeSelectDetail(query)) {
             return false;
         }
+        
         return query;
     };
+    judgeSelectDetail = function (query) {
+        if (CanInputFlagSemester !== false) {
+            if (query.LessonNo == null || query.LessonNo == "") {
+                learun.alert.warning("请选择课程！");
+                return false;
+            }
+            if (query.ClassNo == null || query.ClassNo == "") {
+                learun.alert.warning("请选择班级！");
+                return false;
+            }
+        }
+        return true;
+    };
     page.init();
 }

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

@@ -7959,6 +7959,7 @@
     <Content Include="Areas\EducationalAdministration\Views\web.config" />
     <Content Include="Areas\EducationalAdministration\Views\StuSelectLessonListOfElective\QueryStuSelectResultForTeacher.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElective\FormBatch.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuScore\AllStuScoreQueryPrint.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/EADateArrange/EADateArrangeBLL.cs

@@ -90,6 +90,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        public EADateArrangeEntity GetEntityByNameSemester(string name, string AcademicYearNo, string Semester)
+        {
+            try
+            {
+                return eADateArrangeService.GetEntityByNameSemester(name, AcademicYearNo, Semester);
+            }
+            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

@@ -34,6 +34,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <summary>
         /// <returns></returns>
         EADateArrangeEntity GetEADateArrangeEntityByName(string name);
+        EADateArrangeEntity GetEntityByNameSemester(string name, string AcademicYearNo, string Semester);
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EADateArrange/EADateArrangeService.cs

@@ -131,6 +131,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
+        public EADateArrangeEntity GetEntityByNameSemester(string name, string AcademicYearNo, string Semester)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<EADateArrangeEntity>(x => x.WorkName == name&&x.AcademicYearNo== AcademicYearNo&&x.Semester== Semester);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/VaccinationInfo/VaccinationInfoService.cs

@@ -144,7 +144,7 @@ t.VaccineAddress,t.FirstNeedle,t.SecondNeedle,t.ThirdNeedle,t.NotReason,t.Remark
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@" t.Id,t.EmpNo,s.EmpName,s.IdentityCardNo as CardId,s.F_DepartmentId,s.Mobile,s.IsInActiveStatus,t.VaccineType,
+                strSql.Append(@" t.Id,t.EmpNo,s.EmpName,s.IdentityCardNo as CardId,s.F_DepartmentId as DepartmentId,s.Mobile,s.IsInActiveStatus,t.VaccineType,
 t.VaccineAddress,t.FirstNeedle,t.SecondNeedle,t.ThirdNeedle,t.NotReason,t.Remark,t.CreateTime,t.CreateUser,t.LastTime,t.LastUser ");
                 strSql.Append("  FROM VaccinationInfo t ");
                 strSql.Append("  left join  empinfo s on s.empno=t.empno ");