@@ -103,13 +103,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
public ActionResult GetClassRoomDetailData(string classroomNo, string AcademicYearNo, int? Semester) | public ActionResult GetClassRoomDetailData(string classroomNo, string AcademicYearNo, int? Semester) | ||||
{ | { | ||||
var Exam_ExamRoomData = exam_ExamRoomIBLL.GetEntityByClassroomNo(classroomNo, AcademicYearNo, Semester); | var Exam_ExamRoomData = exam_ExamRoomIBLL.GetEntityByClassroomNo(classroomNo, AcademicYearNo, Semester); | ||||
var Exam_ExamRoomDetailData = exam_ExamRoomDetailIBLL.GetList("").Where(x => x.ClassRoomNo == classroomNo && x.AcademicYearNo == AcademicYearNo && x.Semester == Semester).OrderBy(x => x.ECOrder); | |||||
var jsonData = new | |||||
{ | |||||
Exam_ExamRoomDetailData = Exam_ExamRoomDetailData, | |||||
Exam_ExamRoomData = Exam_ExamRoomData | |||||
}; | |||||
return Success(jsonData); | |||||
var Exam_ExamRoomDetailData = exam_ExamRoomDetailIBLL.GetList().Where(x => x.ClassRoomNo == classroomNo && x.AcademicYearNo == AcademicYearNo && x.Semester == Semester).OrderBy(x => x.ECOrder); | |||||
var data = new { Exam_ExamRoomData, Exam_ExamRoomDetailData }; | |||||
return Success(data); | |||||
} | } | ||||
#endregion | #endregion | ||||
@@ -61,7 +61,24 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
} | } | ||||
} | } | ||||
} | } | ||||
public IEnumerable<Exam_ExamRoomDetailEntity> GetList() | |||||
{ | |||||
try | |||||
{ | |||||
return exam_ExamRoomDetailService.GetList(); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
if (ex is ExceptionEx) | |||||
{ | |||||
throw; | |||||
} | |||||
else | |||||
{ | |||||
throw ExceptionEx.ThrowBusinessException(ex); | |||||
} | |||||
} | |||||
} | |||||
/// <summary> | /// <summary> | ||||
/// 获取实体数据 | /// 获取实体数据 | ||||
/// </summary> | /// </summary> | ||||
@@ -148,7 +165,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
{ | { | ||||
try | try | ||||
{ | { | ||||
exam_ExamRoomDetailService.SaveSaveDetailEntity(ClassroomNo, AcademicYearNo, Semester,entity); | |||||
exam_ExamRoomDetailService.SaveSaveDetailEntity(ClassroomNo, AcademicYearNo, Semester, entity); | |||||
} | } | ||||
catch (Exception ex) | catch (Exception ex) | ||||
{ | { | ||||
@@ -23,6 +23,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
IEnumerable<Exam_ExamRoomDetailEntity> GetPageList(Pagination pagination, string queryJson); | IEnumerable<Exam_ExamRoomDetailEntity> GetPageList(Pagination pagination, string queryJson); | ||||
IEnumerable<Exam_ExamRoomDetailEntity> GetList(string queryJson); | IEnumerable<Exam_ExamRoomDetailEntity> GetList(string queryJson); | ||||
IEnumerable<Exam_ExamRoomDetailEntity> GetList(); | |||||
/// <summary> | /// <summary> | ||||
/// 获取实体数据 | /// 获取实体数据 | ||||
/// </summary> | /// </summary> | ||||
@@ -99,7 +99,35 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration | |||||
} | } | ||||
} | } | ||||
} | } | ||||
/// <summary> | |||||
/// 获取页面显示列表数据 | |||||
/// </summary> | |||||
/// <param name="pagination">查询参数</param> | |||||
/// <param name="queryJson">查询参数</param> | |||||
/// <returns></returns> | |||||
public IEnumerable<Exam_ExamRoomDetailEntity> GetList() | |||||
{ | |||||
try | |||||
{ | |||||
var strSql = new StringBuilder(); | |||||
strSql.Append("SELECT "); | |||||
strSql.Append(@" t.* "); | |||||
strSql.Append(" FROM Exam_ExamRoomDetail t "); | |||||
strSql.Append(" WHERE 1=1 "); | |||||
return this.BaseRepository("CollegeMIS").FindList<Exam_ExamRoomDetailEntity>(strSql.ToString()); | |||||
} | |||||
catch (Exception ex) | |||||
{ | |||||
if (ex is ExceptionEx) | |||||
{ | |||||
throw; | |||||
} | |||||
else | |||||
{ | |||||
throw ExceptionEx.ThrowServiceException(ex); | |||||
} | |||||
} | |||||
} | |||||
/// <summary> | /// <summary> | ||||
/// 获取Exam_ExamPlanLesson表实体数据 | /// 获取Exam_ExamPlanLesson表实体数据 | ||||
/// </summary> | /// </summary> | ||||