From fc8fe9efa46fa5df6c0c410bc356bccd939512f1 Mon Sep 17 00:00:00 2001 From: liangkun Date: Thu, 16 Jun 2022 16:28:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E6=88=90=E7=BB=A9=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E8=AF=BE=E7=A8=8B=E5=A2=9E=E5=8A=A0=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E5=AD=A6=E5=B9=B4=E5=AD=A6=E6=9C=9F=E5=85=B3=E8=81=94=EF=BC=8C?= =?UTF-8?q?=E8=80=83=E8=AF=95=E6=88=90=E7=BB=A9=E5=8E=BB=E6=8E=89=E9=80=80?= =?UTF-8?q?=E5=AD=A6=E8=BD=AC=E6=A0=A1=E7=9A=84=E5=AD=A6=E7=94=9F=EF=BC=8C?= =?UTF-8?q?=E4=BF=9D=E7=95=99=E4=BC=91=E5=AD=A6=E5=AD=A6=E7=94=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuScoreController.cs | 6 ++++-- .../Views/StuScore/InputScoreIndexInTeacher.js | 2 ++ .../InputScoreIndexOfElectiveInTeacher.js | 9 ++++++--- .../StuScore/StuScoreBLL.cs | 8 ++++---- .../StuScore/StuScoreIBLL.cs | 4 ++-- .../StuScore/StuScoreService.cs | 17 +++++++++++++---- 6 files changed, 31 insertions(+), 15 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 67e843cd9..2e67b4fe8 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 @@ -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); 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..6176dbfb2 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 @@ -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"); }, 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 5d92e39a4..d721b9c2d 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 @@ -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 () { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs index cf4e029e4..fe16b50c0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreBLL.cs +++ b/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 /// 课程下拉框信息【学生成绩录入可去审核】 /// /// - public IEnumerable GetLessonNoDataOfAll(string userAccount, string userType) + public IEnumerable 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 /// 课程下拉框信息【选修课】 /// /// - public IEnumerable GetElectiveLessonNoDataOfAll(string userAccount, string userType) + public IEnumerable 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) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs index 453da19a7..840f76b7a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreIBLL.cs +++ b/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 /// 课程下拉框信息【学生成绩录入可去审核】 /// /// - IEnumerable GetLessonNoDataOfAll(string userAccount, string userType); + IEnumerable GetLessonNoDataOfAll(string userAccount, string userType, string AcademicYearNo="", string Semester=""); /// /// 课程下拉框信息【选修课】 /// /// - IEnumerable GetElectiveLessonNoDataOfAll(string userAccount, string userType); + IEnumerable GetElectiveLessonNoDataOfAll(string userAccount, string userType, string AcademicYearNo = "", string Semester = ""); /// /// 教室下拉框信息【选修课】 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs index d3396434f..a04b3c9de 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuScore/StuScoreService.cs +++ b/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 /// 课程下拉框信息【学生成绩录入可去审核】 /// /// - public IEnumerable GetLessonNoDataOfAll(string userAccount, string userType) + public IEnumerable 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(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 /// 课程下拉框信息【选修课】 /// /// - public IEnumerable GetElectiveLessonNoDataOfAll(string userAccount, string userType) + public IEnumerable 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(strSql.ToString()); data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value); return data;