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 d288ff0f6..6e9a5c864 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 @@ -3,6 +3,7 @@ using System.Data; using Learun.Application.TwoDevelopment.EducationalAdministration; using System.Web.Mvc; using System.Collections.Generic; +using System.Linq; namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { @@ -167,14 +168,40 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers /// public ActionResult GetSeatData(string ClassRoomNo, string AcademicYearNo, int? Semester) { - return Success(exam_ExamRoomIBLL.GetEntityByClassroomNo(ClassRoomNo, AcademicYearNo, Semester)); + var data = exam_ExamRoomIBLL.GetEntityByClassroomNo(ClassRoomNo, AcademicYearNo, Semester); + var studata = exam_ArrangeExamTermNewIBLL.GetStuList(AcademicYearNo, Semester, ClassRoomNo).OrderBy(x => x.SitNumber); + var StuList = new List(); + var EaxmStartTime = ""; + var EaxmEndTime = ""; + var teach = ""; + foreach (var item in studata) + { + var list = new EaxmStuList + { + SitNumber = item.SitNumber, + StuName = item.StuName, + StuNo = item.StuNo + }; + StuList.Add(list); + var times = item.ExamTime.Split('-'); + for (int i = 0; i < times.Count(); i++) + { + if (i == 0) + { + EaxmStartTime = item.ExamDate.Value.ToString("yyyy-MM-dd") + " " + times[i] + " ~ "; + } + else + { + EaxmEndTime = item.ExamDate.Value.ToString("yyyy-MM-dd") + " " + times[i]; + } + } + teach = item.EmpName; + } + var dataOne = new { tClassroomName = data.ClassroomName, AcademicYearNo, Semester, data.SeatRows, data.SeatColumns, teach, EaxmStartTime, EaxmEndTime }; + var result = new { dataOne, StuList }; + return Success(result); } - public ActionResult GetSeatStuList(string ClassRoomNo, string AcademicYearNo, int? Semester) - { - var data = exam_ArrangeExamTermNewIBLL.GetStuList(AcademicYearNo, Semester, ClassRoomNo); - return Success(data); - } [HttpGet] [AjaxOnly] @@ -228,5 +255,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers } #endregion + public class EaxmStuList + { + public string StuName { get; set; } + public string StuNo { get; set; } + public string SitNumber { get; set; } + } } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs index e28398b9b..953cdd604 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs @@ -429,6 +429,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers var data = stuInfoBasicIBLL.GetTree(); return Success(data); } + + + [HttpGet] + public ActionResult Direction() + { + return View(); + } #endregion #region 提交数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/IndexClassRoom.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/IndexClassRoom.cshtml index 4efdce64e..3b081ddff 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/IndexClassRoom.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/IndexClassRoom.cshtml @@ -40,6 +40,7 @@
+  查看
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/IndexClassRoom.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/IndexClassRoom.js index 106e9a01d..bb9d03a2b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/IndexClassRoom.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ArrangeExamTermNew/IndexClassRoom.js @@ -71,6 +71,31 @@ var bootstrap = function ($, learun) { $('#lr_refresh').on('click', function () { location.reload(); }); + $('#lr_view').on('click', function () { + var ClassRoomNo = $('#gridtable').jfGridValue('ClassroomNo'); + var AcademicYearNo = $('#gridtable').jfGridValue('AcademicYearNo'); + var Semester = $('#gridtable').jfGridValue('Semester'); + if (learun.checkrow(ClassRoomNo)) { + $.ajax({ + url: '/EducationalAdministration/Exam_ArrangeExamTermNew/GetSeatData', + data: { ClassRoomNo, AcademicYearNo, Semester }, + type: "Post", + dataType: "json", + async: true, + cache: false, + success: function (data) { + console.log(data) + }, + error: function (XMLHttpRequest, textStatus, errorThrown) { + }, + beforeSend: function () { + }, + complete: function () { + } + }); + } + //座位数据 + }); }, // 初始化列表 initGird: function () { @@ -105,8 +130,7 @@ var bootstrap = function ($, learun) { { label: "考试时间", name: "ExamTime", width: 100, align: "left" }, { label: "监考老师", name: "EmpName", width: 200, align: "left" }, { label: "考场人数", name: "ClassRoomNum", width: 100, align: "left" }, - { label: "起止考号", name: "qzkh", width: 100, align: "left", ishide: true,}, - + { label: "起止考号", name: "kh", width: 100, align: "left", ishide: true }, ], //mainId: 'EPIId', isPage: true, 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 f29e9513d..ae5884668 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 @@ -142,46 +142,26 @@ var bootstrap = function ($, learun) { ////弹框文件名字SeatForm if (Semester != '' && AcademicYearNo != '') { - ///学生数据 - //$.ajax({ - // url: '/EducationalAdministration/Exam_ArrangeExamTermNew/GetSeatStuList', - // 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 () { - // } - //}); - //座位数据 // - //$.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(data1) - - // }, - // error: function (XMLHttpRequest, textStatus, errorThrown) { - // }, - // beforeSend: function () { - // }, - // complete: function () { - // } - //}); + $.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 () { + } + }); + //座位数据 } - }); }, initGird: function () { @@ -189,9 +169,13 @@ var bootstrap = function ($, learun) { url: top.$.rootUrl + '/EducationalAdministration/Exam_ArrangeExamTermNew/GetItemPageList', headData: [ { label: '学年', name: 'AcademicYearNo', width: 60, align: "left" }, - { label: '学期', name: 'Semester', width: 45, align: "left" }, + { label: '学期', name: 'Semester', width: 50, align: "left" }, + { label: '学生编号', name: 'StuNo', width: 130, align: "left" }, + { label: '学生姓名', name: 'StuName', width: 100, align: "left" }, + { label: '学籍号', name: 'StuCode', width: 130, align: "left" }, { - label: '考试日期', name: 'ExamDate', width: 90, align: "left", formatter: function (v) { + label: '考试日期', name: 'ExamDate', width: 90, align: "left", + formatter: function (v) { return learun.formatDate(v, "yyyy-MM-dd"); } }, @@ -203,9 +187,8 @@ var bootstrap = function ($, learun) { { label: '教室编号', name: 'ClassroomNo', width: 100, align: "left" }, { label: '教室名称', name: 'ClassroomName', width: 100, align: "left" }, { label: '班级名称', name: 'ClassName', width: 100, align: "left" }, - { label: '学生编号', name: 'StuNo', width: 130, align: "left" }, - { label: '学生姓名', name: 'StuName', width: 100, align: "left" }, - { label: '座位编号', name: 'SitNumber', width: 80, aligndd: "left" } + { label: '座位编号', name: 'SitNumber', width: 80, aligndd: "left" }, + { label: '考号', name: 'kh', width: 140, align: "left", ishide: true }, ], mainId: 'AETId', sidx: ' AcademicYearNo desc,Semester desc,ExamDate desc, LessonNo desc,ClassRoomNo desc,ClassRoomNo desc,SitNumber asc ', diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Direction.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Direction.cshtml new file mode 100644 index 000000000..e6999fe5f --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Direction.cshtml @@ -0,0 +1,57 @@ +@{ + ViewBag.Title = "学生学籍"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
班级列表
+
+
+
+
+
+
+ 学生列表信息 +
+
+
+
+
+
+
+
学号
+ +
+
+
姓名
+ +
+
+
性别
+
+
+
+
民族
+
+
+
+
身份证号
+ +
+
+
+
+
+
+
+ +  打印 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoBasic/Direction.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Direction.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Direction.js new file mode 100644 index 000000000..62608dfba --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Direction.js @@ -0,0 +1,111 @@ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var Class; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + // 初始化左侧树形数据 + $('#dataTree').lrtree({ + url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetTree', + nodeClick: function (item) { + Class = item.value; + page.search({ ClassNo: item.value }); + } + }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 200, 400); + $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' }); + $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' }); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGridLei({ + url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList', + headData: [ + { label: "姓名", name: "StuName", width: 100, align: "center" }, + { + label: "性别", name: "GenderNo", width: 80, align: "center", + formatter: function (cellvalue) { + return cellvalue == true ? "男" : "女"; + } + }, + { label: "身份证号", name: "IdentityCardNo", width: 180, align: "center" }, + { + label: "民族", name: "NationalityNo", width: 100, align: "center", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'National', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "学籍号", name: "StuCode", width: 160, align: "center" , }, + { + label: '选择方向', name: '选择方向', align: "center", statistics: true, + children: [ + { label: "技能高考", name: "GK", width: 100, align: "center" }, + { label: "高职单招", name: "DZ", width: 100, align: "center" }, + { label: "3+2高职转段", name: "ZD", width: 100, align: "center" }, + { label: "就业", name: "JY", width: 80, align: "center"}, + { label: "签名", name: "QM", width: 80, align: "center" }, + ] + }, + + + ], + mainId: 'StuId', + isPage: true, + rows: 100, + isShowNum: true, + // 是否显示序号 + //isMultiselect: true, + //onSelectRow: function (rowdata) { + // if (rowdata.CheckMark == "1") { + // $("#check").hide(); + // $("#uncheck").show(); + // $("#lr_edit").hide(); + // $("#lr_delete").hide(); + // } else { + // $("#uncheck").hide(); + // $("#check").show(); + // $("#lr_edit").show(); + // $("#lr_delete").show(); + // } + //} + + }); + page.search(); + }, + search: function (param) { + if (learun.clientdata.get(['userinfo']).account.toLowerCase() != "system") {//登录用户是system时，列表展示所有学生；其他用户登录时，必须选择左侧班级才能查看学生； + if (Class == "" || Class == undefined || Class == null) { + learun.alert.warning("请选择左侧班级！"); + return false; + } + } + param = param || {}; + param.ClassNo = Class; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 1182ef791..ecd0b6a29 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1221,6 +1221,7 @@ + @@ -1338,6 +1339,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermItemNew/Exam_ArrangeExamTermItemNewEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermItemNew/Exam_ArrangeExamTermItemNewEntity.cs index bb95bc82b..d166b297d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermItemNew/Exam_ArrangeExamTermItemNewEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermItemNew/Exam_ArrangeExamTermItemNewEntity.cs @@ -128,6 +128,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [NotMapped] ///考试专业 public string TeachMajorNo { get; set; } + /// + /// 学籍号 + /// + [NotMapped] + public string StuCode { get; set; } + /// + /// 考号 + /// + [NotMapped] + public string kh { get; set; } + #endregion } } 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 bbbfc40c3..f83a056fd 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 @@ -209,7 +209,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration 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 "); + strSql.Append(@"select t.*,e.AcademicYearNo,e.Semester,s.StuCode from Exam_ArrangeExamTermItemNew t join Exam_ExamPlan e on t.EPId=e.EPId "); + strSql.Append(@" left join stuinfobasic s on s.StuNo=t.StuNo where 1=1 and t.ClassNo is not null "); var queryParam = queryJson.ToJObject(); if (!queryParam["AcademicYearNo"].IsEmpty()) {