From 805db4c616e0f83ec8220e94c9895d5b3747c172 Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 19 Apr 2023 10:24:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=95=99=E5=AD=A6=E8=B4=A8=E9=87=8F=20?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Exam_ArrangeExamTermNewController.cs | 34 ++--- .../TeachingQualityIndex.cshtml | 6 +- .../TeachingQualityIndex.js | 132 +++++++++++++++++- .../Exam_ArrangeExamTermNewBLL.cs | 19 +++ .../Exam_ArrangeExamTermNewIBLL.cs | 8 ++ .../Exam_ArrangeExamTermNewService.cs | 33 ++++- 6 files changed, 199 insertions(+), 33 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ArrangeExamTermNewController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ArrangeExamTermNewController.cs index 22bc35977..1682adec4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ArrangeExamTermNewController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ArrangeExamTermNewController.cs @@ -132,40 +132,28 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success(jsonData); } + /// + /// 教学质量监测 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetLessonList(string academicYearNo, string semester, string classNo) + { + var data = exam_ArrangeExamTermNewIBLL.GetLessonList(academicYearNo, semester, classNo).OrderBy(x => x.value); + return Success(data); + } public ActionResult GetTeachingQualityPageList(string pagination, string queryJson) { Pagination paginationobj = pagination.ToObject(); var data = exam_ArrangeExamTermNewIBLL.GetTeachingQualityPageList(paginationobj, queryJson); - var stuData = stuInfoBasicIBLL.GetAllList(); - - var aa = data.GroupBy(x => new { x.StuNo, x.StuName, x.StuId }).Select(x => new - { - StuId = x.Key.StuId, - StuNo = x.Key.StuNo, - StuName = x.Key.StuName, - //FinishSchoolMark = stuData.FirstOrDefault(a => a.StuNo == x.Key.StuNo)?.FinishSchoolMark, - //TotalScore = x.Select(y => y.Score).Sum(), - //LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score, y.ScoreFormat }).OrderBy(y => y.LessonNo) - }).OrderByDescending(x => x.StuNo); - - var result = new List>(); - foreach (var item in aa) - { - var aaa = new Dictionary(); - aaa.Add("StuId", item.StuId); - aaa.Add("StuNo", item.StuNo); - aaa.Add("StuName", item.StuName); - result.Add(aaa); - } - var jsonData = new { rows = data, total = paginationobj.total, page = paginationobj.page, records = paginationobj.records, - result = result }; return Success(jsonData); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/TeachingQualityIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/TeachingQualityIndex.cshtml index c972cf222..6c9d6cf02 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/TeachingQualityIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/TeachingQualityIndex.cshtml @@ -25,9 +25,9 @@
- @*
-
-
*@ +
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/TeachingQualityIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/TeachingQualityIndex.js index 8318c2970..e4d0c1a7c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/TeachingQualityIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/TeachingQualityIndex.js @@ -6,6 +6,8 @@ */ var selectedRow; var refreshGirdData; +//课程列 +var LessonTemp = []; var bootstrap = function ($, learun) { "use strict"; @@ -59,13 +61,46 @@ var bootstrap = function ($, learun) { }); // 查询 $('#btn_Search').on('click', function () { - page.search({ ClassRoomNo: ClassRoomNo, AcademicYearNo: $('#AcademicYearNo').lrselectGet(), Semester: $('#Semester').lrselectGet(), LessonNo: $('#LessonNo').lrselectGet(), EmpNo: $('#EmpNo').lrselectGet() }); + var p = {}; + p.AcademicYearNo = $('#AcademicYearNo').lrselectGet(); + p.Semester = $('#Semester').lrselectGet(); + p.ClassNo = $('#ClassNo').lrselectGet(); + if (p.AcademicYearNo == null || p.AcademicYearNo == "") { + learun.alert.warning("请选择学年！"); + return; + } + if (p.Semester == null || p.Semester == "") { + learun.alert.warning("请选择学期！"); + return; + } + if (p.ClassNo == null || p.ClassNo == "") { + learun.alert.warning("请选择班级！"); + return; + } + //page.search({ ClassRoomNo: ClassRoomNo, AcademicYearNo: $('#AcademicYearNo').lrselectGet(), Semester: $('#Semester').lrselectGet(), LessonNo: $('#LessonNo').lrselectGet(), EmpNo: $('#EmpNo').lrselectGet() }); + + $.lrSetFormWithParam(top.$.rootUrl + '/EducationalAdministration/Exam_ArrangeExamTermNew/GetLessonList', p, + function (data) { + var temparr = []; + for (var i = 0; i < data.length; i++) { + var item = {}; + item.label = data[i].text; + item.name = data[i].value; + item.width = 150; + item.align = "left"; + temparr.push(item); + } + LessonTemp = temparr; + + page.initGird(); + page.search(p); + }); }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); }); - + $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' }); $('#AcademicYearNo').lrselect({ placeholder: "学年", allowSearch: false, @@ -83,7 +118,7 @@ var bootstrap = function ($, learun) { }); $('#AcademicYearNo').bind('change', function () { - ClassRoomNo= '' + ClassRoomNo = '' var AcademicYearNo = ''; var Semester = ''; if ($('#AcademicYearNo').lrselectGet()) { @@ -210,7 +245,96 @@ var bootstrap = function ($, learun) { sidx: ' AcademicYearNo desc,Semester desc,ExamDate desc, LessonNo desc,ClassRoomNo desc,ClassRoomNo desc,SitNumber asc ', isPage: true }); - page.search(); + + //var headData = [ + // { + // label: '学校', name: 'F_SchoolId', width: 190, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'company', + // key: value, + // keyId: 'f_companyid', + // callback: function (_data) { + // callback(_data['f_fullname']); + // } + // }); + // } + // }, + // { label: '学年', name: 'AcademicYearNo', width: 60, align: "left" }, + // { label: '学期', name: 'Semester', width: 50, align: "left" }, + // { label: '姓名', name: 'StuName', width: 100, align: "left" }, + // { label: '学生编号', name: 'StuNo', width: 130, align: "left" }, + // { label: '学籍号', name: 'StuCode', width: 130, align: "left" }, + // { + // label: "系所", name: "DeptNo", width: 100, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + // key: value, + // keyId: 'deptno', + // callback: function (_data) { + // callback(_data['deptname']); + // } + // }); + // } + // }, + // { + // label: "专业", name: "MajorNo", width: 100, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', + // key: value, + // keyId: 'majorno', + // callback: function (_data) { + // callback(_data['majorname']); + // } + // }); + // } + // }, + // { + // label: "班级", name: "ClassNo", width: 100, align: "left", + // formatterAsync: function (callback, value, row, op, $cell) { + // learun.clientdata.getAsync('custmerData', { + // url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', + // key: value, + // keyId: 'classno', + // callback: function (_data) { + // callback(_data['classname']); + // } + // }); + // } + // }, + + // { + // label: '考试日期', name: 'ExamDate', width: 90, align: "left", + // formatter: function (v) { + // return learun.formatDate(v, "yyyy-MM-dd"); + // } + // }, + // { label: '考试时间', name: 'ExamTime', width: 90, align: "left" }, + // { label: '课程编号', name: 'LessonNo', width: 100, align: "left" }, + // { label: '课程名称', name: 'LessonName', width: 200, align: "left" }, + // { label: '监考教师编号', name: 'EmpNo', width: 150, align: "left" }, + // { label: '监考教师姓名', name: 'EmpName', width: 150, align: "left" }, + // { label: '教室编号', name: 'ClassroomNo', width: 100, align: "left" }, + // { label: '教室名称', name: 'ClassroomName', width: 100, align: "left" }, + // { label: '班级名称', name: 'ClassName', width: 100, align: "left" }, + // { label: '座位编号', name: 'SitNumber', width: 80, aligndd: "left" }, + // { label: '考号', name: 'kh', width: 140, align: "left", ishide: true }, + //]; + //var headDatas = headData.concat(LessonTemp); + + //$("#gridtable")[0].dfop = undefined; + //$('#gridtable').lrAuthorizeJfGridLei({ + // url: top.$.rootUrl + '/EducationalAdministration/StuScore/GetScoreListByClassNo', + // headData: headDatas, + // mainId: 'StuNo', + // isPage: false, + // sidx: 'StuNo', + // sord: 'desc', + // isMultiselect: true + //}); + //page.search(); }, search: function (param) { param = param || {}; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewBLL.cs index fbb9b961a..ab5abfc37 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewBLL.cs @@ -165,6 +165,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + public IEnumerable GetLessonList(string academicYearNo, string semester, string classNo) + { + try + { + return exam_ArrangeExamTermNewService.GetLessonList(academicYearNo, semester, classNo); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + public IEnumerable GetStuList(string AcademicYearNo, int? Semester, string ClassRoomNo,string LessonNo) { try diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewIBLL.cs index 993041eec..1793e67be 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewIBLL.cs @@ -27,6 +27,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration IEnumerable ScreeningPlan(Pagination pagination, string queryJson); IEnumerable GetItemPageList(Pagination pagination, string queryJson); IEnumerable GetTeachingQualityPageList(Pagination pagination, string queryJson); + /// + /// 教学质量监测 + /// + /// + /// + /// + /// + IEnumerable GetLessonList(string academicYearNo, string semester, string classNo); IEnumerable GetStuList(string AcademicYearNo, int? Semester, string ClassRoomNo, string LessonNo); /// diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs index 733c12c75..3749eef9b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs @@ -338,7 +338,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { strSql.Append(" AND ( ExamDate >= '" + queryParam["StartTime"].ToString() + "' AND ExamDate <= '" + queryParam["EndTime"].ToString() + "' ) "); } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), null, pagination); } catch (Exception ex) @@ -354,6 +353,34 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } /// + /// 课程信息【班级成绩查看】 + /// + /// + public IEnumerable GetLessonList(string academicYearNo, string semester, string classNo) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("select distinct s.LessonNo as value,s.LessonName as text from stuscore s "); + strSql.Append(" where s.AcademicYearNo='" + academicYearNo + "' and s.Semester='" + semester + "' and s.ClassNo='" + classNo + "' and s.LessonSortNo='1' "); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString()).Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value); + //data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value); + + + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + /// /// 获取页面显示列表数据 /// /// 查询参数 @@ -455,13 +482,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// /// - public IEnumerable GetStuList(string AcademicYearNo, int? Semester, string ClassRoomNo,string LessonNo) + public IEnumerable GetStuList(string AcademicYearNo, int? Semester, string ClassRoomNo, string LessonNo) { try { var strSql = new StringBuilder(); strSql.Append(@"select t.*,e.AcademicYearNo,e.Semester from Exam_ArrangeExamTermItemNew t join Exam_ExamPlan e on t.EPId=e.EPId where 1=1 and t.ClassNo is not null - and e.AcademicYearNo ='" + AcademicYearNo + "' and e.Semester='" + Semester + "' and Classroomno= '" + ClassRoomNo + "' and LessonNo = '"+ LessonNo + "' "); + and e.AcademicYearNo ='" + AcademicYearNo + "' and e.Semester='" + Semester + "' and Classroomno= '" + ClassRoomNo + "' and LessonNo = '" + LessonNo + "' "); return this.BaseRepository("CollegeMIS").FindList(strSql.ToString()); } catch (Exception ex) From 417f764fce0374d4f899eb24b163eba28766468e Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 19 Apr 2023 10:28:51 +0800 Subject: [PATCH 2/3] --- .../Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs index 3749eef9b..42ad16276 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs @@ -361,7 +361,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { var strSql = new StringBuilder(); - strSql.Append("select distinct s.LessonNo as value,s.LessonName as text from stuscore s "); + strSql.Append("select distinct s.LessonName as value,s.TeachClassNo as text from stuscore s "); strSql.Append(" where s.AcademicYearNo='" + academicYearNo + "' and s.Semester='" + semester + "' and s.ClassNo='" + classNo + "' and s.LessonSortNo='1' "); return this.BaseRepository("CollegeMIS").FindList(strSql.ToString()).Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value); //data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value); From e6f82e3800fe36dcaa2fe4324417edaa1b536067 Mon Sep 17 00:00:00 2001 From: ndbs Date: Wed, 19 Apr 2023 10:33:28 +0800 Subject: [PATCH 3/3] --- .../Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs index 42ad16276..78d2110e7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs @@ -361,7 +361,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { var strSql = new StringBuilder(); - strSql.Append("select distinct s.LessonName as value,s.TeachClassNo as text from stuscore s "); + strSql.Append("select distinct s.LessonName as value,s.EmpNo as text from stuscore s "); strSql.Append(" where s.AcademicYearNo='" + academicYearNo + "' and s.Semester='" + semester + "' and s.ClassNo='" + classNo + "' and s.LessonSortNo='1' "); return this.BaseRepository("CollegeMIS").FindList(strSql.ToString()).Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value); //data = data.Where(x => !string.IsNullOrEmpty(x.value)).OrderBy(x => x.value);