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

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

@@ -534,7 +534,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult GetLessonNoDataWithNo()
         {
             var loginInfo = LoginUserInfo.Get();
-            var data = stuScoreIBLL.GetLessonNoDataOfAll(loginInfo.account, loginInfo.Description);
+            var semesterAndYear = Common.GetSemesterAndYear();
+            var data = stuScoreIBLL.GetLessonNoDataOfAll(loginInfo.account, loginInfo.Description,semesterAndYear.AcademicYearShort,semesterAndYear.Semester);
             foreach (var item in data)
             {
                 item.text = string.Format("{0}({1})", item.text, item.value);
@@ -567,7 +568,8 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         public ActionResult GetElectiveLessonNoDataWithNo()
         {
             var loginInfo = LoginUserInfo.Get();
-            var data = stuScoreIBLL.GetElectiveLessonNoDataOfAll(loginInfo.account, loginInfo.Description);
+            var semesterAndYear = Common.GetSemesterAndYear();
+            var data = stuScoreIBLL.GetElectiveLessonNoDataOfAll(loginInfo.account, loginInfo.Description, semesterAndYear.AcademicYearShort, semesterAndYear.Semester);
             foreach (var item in data)
             {
                 item.text = string.Format("{0}({1})", item.text, item.value);

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

@@ -496,6 +496,8 @@ var bootstrap = function ($, learun) {
                 if (ref.code == "200") {
                     $('#AcademicYearNo').lrselectSet(ref.data.Item1);
                     $('#Semester').lrselectSet(ref.data.Item3);
+                    $('#AcademicYearNo').attr('disabled', "disabled");
+                    $('#Semester').attr('disabled', "disabled");
                 }
             }.bind(this), "json");
         },

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

@@ -513,6 +513,9 @@ var bootstrap = function ($, learun) {
                 if (ref.code == "200") {
                     $('#AcademicYearNo').lrselectSet(ref.data.Item1);
                     $('#Semester').lrselectSet(ref.data.Item3);
+                    $('#AcademicYearNo').attr('disabled', "disabled");
+                    $('#Semester').attr('disabled', "disabled");
+
                 }
             }.bind(this), "json");
         },
@@ -534,8 +537,8 @@ var bootstrap = function ($, learun) {
         searchScale: function (param) {
             param = param || {};
             $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/OpenLessonPlanOfElective/GetStuSelectLessonListEntityByJson?queryJson=' + JSON.stringify(param), function (data) {
-                if (data["StuSelectLessonList"] != null) {
-                    var ssll = data["StuSelectLessonList"];
+                if (data["StuSelectLessonListOfElective"] != null) {
+                    var ssll = data["StuSelectLessonListOfElective"];
                     $('#OrdinaryScoreScale').html(ssll.OrdinaryScoreScale > 0 ? ssll.OrdinaryScoreScale : 0);
                     $('#TermInScoreScale').html(ssll.TermInScoreScale > 0 ? ssll.TermInScoreScale : 0);
                     $('#TermEndScoreScale').html(ssll.TermEndScoreScale > 0 ? ssll.TermEndScoreScale : 0);
@@ -590,7 +593,7 @@ var bootstrap = function ($, learun) {
             page.initGird();
 
             page.search(query);
-            //page.searchScale(query);
+            page.searchScale(query);
         }
     };
     judgeSelect = function () {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs

@@ -547,11 +547,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 课程下拉框信息【学生成绩录入可去审核】
         /// </summary>
         /// <returns></returns>
-        public IEnumerable<WebHelper.YearGrade> GetLessonNoDataOfAll(string userAccount, string userType)
+        public IEnumerable<WebHelper.YearGrade> GetLessonNoDataOfAll(string userAccount, string userType, string AcademicYearNo="", string Semester="")
         {
             try
             {
-                return stuScoreService.GetLessonNoDataOfAll(userAccount, userType);
+                return stuScoreService.GetLessonNoDataOfAll(userAccount, userType,AcademicYearNo, Semester);
             }
             catch (Exception ex)
             {
@@ -570,11 +570,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 课程下拉框信息【选修课】
         /// </summary>
         /// <returns></returns>
-        public IEnumerable<WebHelper.YearGrade> GetElectiveLessonNoDataOfAll(string userAccount, string userType)
+        public IEnumerable<WebHelper.YearGrade> GetElectiveLessonNoDataOfAll(string userAccount, string userType, string AcademicYearNo = "", string Semester = "")
         {
             try
             {
-                return stuScoreService.GetElectiveLessonNoDataOfAll(userAccount, userType);
+                return stuScoreService.GetElectiveLessonNoDataOfAll(userAccount, userType,AcademicYearNo,Semester);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs

@@ -145,13 +145,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// 课程下拉框信息【学生成绩录入可去审核】
         /// </summary>
         /// <returns></returns>
-        IEnumerable<WebHelper.YearGrade> GetLessonNoDataOfAll(string userAccount, string userType);
+        IEnumerable<WebHelper.YearGrade> GetLessonNoDataOfAll(string userAccount, string userType, string AcademicYearNo="", string Semester="");
 
         /// <summary>
         /// 课程下拉框信息【选修课】
         /// </summary>
         /// <returns></returns>
-        IEnumerable<WebHelper.YearGrade> GetElectiveLessonNoDataOfAll(string userAccount, string userType);
+        IEnumerable<WebHelper.YearGrade> GetElectiveLessonNoDataOfAll(string userAccount, string userType, string AcademicYearNo = "", string Semester = "");
 
         /// <summary>
         /// 教室下拉框信息【选修课】

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs

@@ -130,8 +130,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 strSql.Append("SELECT t.* FROM StuScore t where 1=1 ");
 
                 //学籍异动的学生不显示
-                strSql.Append(" and t.StuNo not in (select StuNo from StuInfoBasic where ChangeStatus=1) ");
-
+                //strSql.Append(" and t.StuNo not in (select StuNo from StuInfoBasic where ChangeStatus=1) ");
+                //20220616改 休学的要录入成绩，退学和转校的不用
+                strSql.Append(" and t.StuNo not in (select StuNo from StuInfoBasicChange where StuChangeType in('04','06')) ");
                 var queryParam = queryJson.ToJObject();
                 var dp = new DynamicParameters(new { });
                 if (!queryParam["F_SchoolId"].IsEmpty())
@@ -1112,7 +1113,7 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
         /// 课程下拉框信息【学生成绩录入可去审核】
         /// </summary>
         /// <returns></returns>
-        public IEnumerable<WebHelper.YearGrade> GetLessonNoDataOfAll(string userAccount, string userType)
+        public IEnumerable<WebHelper.YearGrade> GetLessonNoDataOfAll(string userAccount, string userType,string AcademicYearNo="",string Semester="")
         {
             try
             {
@@ -1126,6 +1127,10 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
                 {
                     strSql.Append(" and s.EmpNo='" + userAccount + "' ");
                 }
+                if (!string.IsNullOrEmpty(AcademicYearNo))
+                {
+                    strSql.Append(" and s.AcademicYearNo='" + AcademicYearNo + "' and s.Semester='"+Semester+"' ");
+                }
                 var data = this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>(strSql.ToString());
                 data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);
                 return data;
@@ -1147,7 +1152,7 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
         /// 课程下拉框信息【选修课】
         /// </summary>
         /// <returns></returns>
-        public IEnumerable<WebHelper.YearGrade> GetElectiveLessonNoDataOfAll(string userAccount, string userType)
+        public IEnumerable<WebHelper.YearGrade> GetElectiveLessonNoDataOfAll(string userAccount, string userType, string AcademicYearNo = "", string Semester = "")
         {
             try
             {
@@ -1157,6 +1162,10 @@ where StuNo not in(Select StuNo from stuscore s where s.Academicyearno = sl.Acad
                 {
                     strSql.Append(" and s.EmpNo='" + userAccount + "' ");
                 }
+                if (!string.IsNullOrEmpty(AcademicYearNo))
+                {
+                    strSql.Append(" and s.AcademicYearNo='" + AcademicYearNo + "' and s.Semester='" + Semester + "' ");
+                }
                 var data = this.BaseRepository("CollegeMIS").FindList<WebHelper.YearGrade>(strSql.ToString());
                 data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);
                 return data;