From 48fd9c734e6f034dae32d255c1cb0a69cefe87d1 Mon Sep 17 00:00:00 2001 From: yxq Date: Fri, 14 Apr 2023 11:12:08 +0800 Subject: [PATCH] =?UTF-8?q?web=20=E6=8E=92=E8=80=83=E6=98=8E=E7=BB=86=20?= =?UTF-8?q?=E8=80=83=E5=9C=BA=E5=AE=89=E6=8E=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Exam_ArrangeExamTermNewController.cs | 4 +- .../Exam_ArrangeExamTermNew/IndexItem.js | 59 ++++++------------- .../Exam_ArrangeExamTermNew/SeatForm.cshtml | 58 +++++++----------- .../Exam_ArrangeExamTermNewBLL.cs | 4 +- .../Exam_ArrangeExamTermNewIBLL.cs | 2 +- .../Exam_ArrangeExamTermNewService.cs | 4 +- 6 files changed, 45 insertions(+), 86 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 6e9a5c864..7e19ebd7e 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 @@ -166,10 +166,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers /// /// /// - public ActionResult GetSeatData(string ClassRoomNo, string AcademicYearNo, int? Semester) + public ActionResult GetSeatData(string ClassRoomNo, string AcademicYearNo, int? Semester,string LessonNo) { var data = exam_ExamRoomIBLL.GetEntityByClassroomNo(ClassRoomNo, AcademicYearNo, Semester); - var studata = exam_ArrangeExamTermNewIBLL.GetStuList(AcademicYearNo, Semester, ClassRoomNo).OrderBy(x => x.SitNumber); + var studata = exam_ArrangeExamTermNewIBLL.GetStuList(AcademicYearNo, Semester, ClassRoomNo, LessonNo).OrderBy(x => x.SitNumber); var StuList = new List(); var EaxmStartTime = ""; var EaxmEndTime = ""; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/IndexItem.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/IndexItem.js index 5570f69e6..e6fd0df2f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/IndexItem.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/IndexItem.js @@ -83,6 +83,7 @@ var bootstrap = function ($, learun) { }); $('#AcademicYearNo').bind('change', function () { + ClassRoomNo= '' var AcademicYearNo = ''; var Semester = ''; if ($('#AcademicYearNo').lrselectGet()) { @@ -102,6 +103,7 @@ var bootstrap = function ($, learun) { } }); $('#Semester').bind('change', function () { + ClassRoomNo = '' var AcademicYearNo = ''; var Semester = ''; if ($('#AcademicYearNo').lrselectGet()) { @@ -125,51 +127,26 @@ var bootstrap = function ($, learun) { $('#ClassRoomNo').lrDataSourceSelect({ code: 'ClassRoomInfo', value: 'classroomno', text: 'classroomname', placeholder: '请选择教室' }); $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname', placeholder: '请选择教师' }); $('#lr_view').on('click', function () { - var AcademicYearNo = ''; - var Semester = ''; + var AcademicYearNo = $('#AcademicYearNo').lrselectGet() || ''; + var Semester = $('#Semester').lrselectGet() || ''; + var LessonNo = $('#LessonNo').lrselectGet() || ''; + console.log({ AcademicYearNo, Semester, LessonNo }, AcademicYearNo != '' && Semester != '' && LessonNo != '') + if (AcademicYearNo == '' && Semester == '' || LessonNo == '' ) { + learun.alert.warning("请选择学年，学期以及课程"); + return; + } if (!ClassRoomNo) { learun.alert.warning("请选择考场"); return; } - if ($('#AcademicYearNo').lrselectGet()) { - AcademicYearNo = '22-23'//$('#AcademicYearNo').lrselectGet(); - - } - if ($('#Semester').lrselectGet()) { - Semester = '2'//$('#Semester').lrselectGet(); - } - - ////弹框文件名字SeatForm - - if (Semester != '' && AcademicYearNo != '') { - learun.layerForm({ - id: 'SeatForm', - title: '排考座位表', - url: top.$.rootUrl + '/EducationalAdministration/Exam_ArrangeExamTermNew/SeatForm?' + $.param({ ClassRoomNo: ClassRoomNo, AcademicYearNo: AcademicYearNo, Semester }), - width: 1200, - height: 800, - btn: null - }); - // - //$.ajax({ - // url: '/EducationalAdministration/Exam_ArrangeExamTermNew/GetSeatData', - // data: { ClassRoomNo: ClassRoomNo, AcademicYearNo: AcademicYearNo, Semester, Semester }, - // type: "Post", - // dataType: "json", - // async: true, - // cache: false, - // success: function (data) { - // console.log(data) - // }, - // error: function (XMLHttpRequest, textStatus, errorThrown) { - // }, - // beforeSend: function () { - // }, - // complete: function () { - // } - //}); - //座位数据 - } + learun.layerForm({ + id: 'SeatForm', + title: '排考座位表', + url: top.$.rootUrl + '/EducationalAdministration/Exam_ArrangeExamTermNew/SeatForm?' + $.param({ ClassRoomNo, AcademicYearNo, Semester, LessonNo }), + width: 1200, + height: 800, + btn: null + }); }); }, initGird: function () { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/SeatForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/SeatForm.cshtml index 83965dae7..384ccb19a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/SeatForm.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/SeatForm.cshtml @@ -3,22 +3,24 @@ Layout = "~/Views/Shared/_Index.cshtml"; } -
-
+
+
{{dataOne.tClassroomName}}排考座位表 +
打 印
-
+
监考老师：{{dataOne.teach}} 考试时间：{{dataOne.EaxmStartTime}}{{dataOne.EaxmEndTime}}
-
    -
  • -
    +
      +
    • +
      {{item.StuName}}
      {{item.SitNumber}}
    +
    暂无数据
    - 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 290aa3944..42921ebe8 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 @@ -147,11 +147,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } - public IEnumerable GetStuList(string AcademicYearNo, int? Semester, string ClassRoomNo) + public IEnumerable GetStuList(string AcademicYearNo, int? Semester, string ClassRoomNo,string LessonNo) { try { - return exam_ArrangeExamTermNewService.GetStuList(AcademicYearNo, Semester, ClassRoomNo); + return exam_ArrangeExamTermNewService.GetStuList(AcademicYearNo, Semester, ClassRoomNo, LessonNo); } catch (Exception ex) { 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 4d899591f..1df0367ac 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,7 +27,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration IEnumerable ScreeningPlan(Pagination pagination, string queryJson); IEnumerable GetItemPageList(Pagination pagination, string queryJson); - IEnumerable GetStuList(string AcademicYearNo, int? Semester, string ClassRoomNo); + 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 f83a056fd..fba7256f2 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 @@ -378,13 +378,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// /// - public IEnumerable GetStuList(string AcademicYearNo, int? Semester, string ClassRoomNo) + 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 e.AcademicYearNo ='" + AcademicYearNo + "' and e.Semester='" + Semester + "' and Classroomno= '" + ClassRoomNo + "' and LessonNo = '"+ LessonNo + "' "); return this.BaseRepository("CollegeMIS").FindList(strSql.ToString()); } catch (Exception ex)