diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamRoomController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamRoomController.cs index c2ee9a8f6..8721f5ce0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamRoomController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamRoomController.cs @@ -159,6 +159,13 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers } return Success("保存成功！"); } + [HttpPost] + [AjaxOnly] + public ActionResult SeatForm(string AcademicYearNo, string Semester,string Type) + { + int res = exam_ExamRoomIBLL.SeatEntity(AcademicYearNo, Semester); + return Success("清空" + res + "条数据！"); + } /// /// 启用/停用 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.js index 922009c4f..af68a324d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.js @@ -59,6 +59,11 @@ var bootstrap = function ($, learun) { learun.alert.warning("选中记录已启用！"); return false; } + var IsEdit = $('#gridtable').jfGridValue('IsEdit'); + if (IsEdit === "false") { + learun.alert.warning("选中记录中包含已排考项目！"); + return; + } if (learun.checkrow(keyValue)) { learun.layerForm({ id: 'form', @@ -87,7 +92,7 @@ var bootstrap = function ($, learun) { } }); }); - + // 按条件清空数据 $('#lr_emptyWhere').on('click', function () { learun.layerForm({ @@ -111,6 +116,11 @@ var bootstrap = function ($, learun) { learun.alert.warning("选中记录中包含已启用项目！"); return; } + var IsEdit = $('#gridtable').jfGridValue('IsEdit'); + if (IsEdit === "false") { + learun.alert.warning("选中记录中包含已排考项目！"); + return; + } learun.layerConfirm('是否确认删除该项！', function (res) { if (res) { learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Exam_ExamRoom/DeleteForm', { keyValue: keyValue }, function () { @@ -147,6 +157,11 @@ var bootstrap = function ($, learun) { learun.alert.warning("选中记录中包含已停用项目！"); return; } + var IsEdit = $('#gridtable').jfGridValue('IsEdit'); + if (IsEdit === "false") { + learun.alert.warning("选中记录中包含已排考项目！"); + return; + } learun.layerConfirm('是否确认停用选中记录！', function (res) { if (res) { learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/Exam_ExamRoom/Lock', { keyValue: keyValue, EREnabled: 0 }, function () { @@ -156,7 +171,7 @@ var bootstrap = function ($, learun) { }); } }); - + }, // 初始化列表 initGird: function () { @@ -176,6 +191,13 @@ var bootstrap = function ($, learun) { return cellvalue == 1 ? "" : ""; } }, + { + label: "是否可编辑", name: "IsEdit", width: 100, align: "left", + formatter: function (cellvalue) { + return cellvalue == true ? "可编辑" : "不可编辑"; + } + }, + ], mainId: 'ERId', isMultiselect: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/Exam_ExamPlanRoomDetailMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/Exam_ExamPlanRoomDetailMap.cs index 655e67029..9a1210318 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/Exam_ExamPlanRoomDetailMap.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/Exam_ExamPlanRoomDetailMap.cs @@ -10,13 +10,13 @@ namespace Learun.Application.Mapping /// 日 期：2022-04-12 15:47 /// 描 述：考试课程表 /// - public class Exam_ExamPlanRoomDetailMap : EntityTypeConfiguration + public class Exam_ExamRoomDetailMap : EntityTypeConfiguration { - public Exam_ExamPlanRoomDetailMap() + public Exam_ExamRoomDetailMap() { #region 表、主键 //表 - this.ToTable("Exam_ExamPlanRoomDetail"); + this.ToTable("Exam_ExamRoomDetail"); //主键 this.HasKey(t => t.ID); #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomBLL.cs index 5f2d6e9f3..97c7bb427 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomBLL.cs @@ -200,6 +200,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + public string SeatEntity(string AcademicYearNo, string Semester, int Type) + { + try + { + exam_ExamRoomService.SeatEntity(AcademicYearNo, Semester, Type); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomEntity.cs index 86498a0cf..66cadd22c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomEntity.cs @@ -64,6 +64,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("ERENABLED")] public bool? EREnabled { get; set; } + /// + /// Isedit + /// + /// + [Column("ISEDIT")] + public bool? IsEdit { get; set; } #endregion #region 扩展操作 @@ -73,6 +79,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration public void Create() { this.ERId = Guid.NewGuid().ToString(); + this.IsEdit = true; } /// /// 编辑调用 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomIBLL.cs index 104571f48..16a35c9dd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomIBLL.cs @@ -52,7 +52,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration int Import(string AcademicYearNo, string Semester, int SeatRows, int SeatColumns); int DeleteWhere(string AcademicYearNo, string Semester); - + string SeatEntity(string AcademicYearNo, string Semester, int Type); #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomService.cs index 0b12a54a3..22e0aa4f5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomService.cs @@ -296,8 +296,10 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration ,[SeatColumns] ,[SeatCount] ,[EROrder] - ,[EREnabled]) -select NEWID(),'{AcademicYearNo}','{Semester}',ClassroomName,[ClassroomNo],{SeatRows},{SeatColumns},{SeatRows}*{SeatColumns},0,1 from ClassroomInfo where CheckMark=1 + ,[EREnabled] + ,[IsEdit] +) +select NEWID(),'{AcademicYearNo}','{Semester}',ClassroomName,[ClassroomNo],{SeatRows},{SeatColumns},{SeatRows}*{SeatColumns},0,1,1 from ClassroomInfo where CheckMark=1 and [ClassroomNo] not in (select [ClassroomNo] from Exam_ExamRoom where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' ) "; return this.BaseRepository("CollegeMIS").ExecuteBySql(sql); @@ -325,7 +327,7 @@ select NEWID(),'{AcademicYearNo}','{Semester}',ClassroomName,[ClassroomNo],{Seat { try { - string sql = $"delete Exam_ExamRoom where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}'"; + string sql = $"delete Exam_ExamRoom where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' and IsEdit = 'true'"; return this.BaseRepository("CollegeMIS").ExecuteBySql(sql); } catch (Exception ex) @@ -340,6 +342,61 @@ select NEWID(),'{AcademicYearNo}','{Semester}',ClassroomName,[ClassroomNo],{Seat } } } + + + + /// + /// 删除实体数据 + /// + /// 主键 + public string SeatEntity(string AcademicYearNo, int Semester, int Type) + { + var db = this.BaseRepository().BeginTrans(); + try + { + if (Type == 1) + { + var room = db.FindList().Where(x => x.AcademicYearNo == AcademicYearNo && x.Semester == Semester).ToList(); + if (room.Count() > 0) + { + Exam_ExamRoomDetailEntity entity = new Exam_ExamRoomDetailEntity(); + for (int i = 0; i < room.Count(); i++) + { + for (int j = 0; j < room[i].SeatCount; j++) + { + entity.AcademicYearNo = AcademicYearNo; + entity.Semester = Semester; + entity.ClassRoomNo = room[j].ClassroomNo; + entity.ClassRoomName = room[j].ClassroomName; + entity.ECOrder = i + 1; + entity.Create(); + db.Insert(entity); + } + room[i].IsEdit = false;//修改为不可编辑 + } + } + db.Update(room);//修改为不可编辑 + } + else + { + var sql = "delete from Exam_ExamRoomDetail where AcademicYearNo ='" + AcademicYearNo + "' and Semester='"+ Semester + "'; update Exam_ExamRoom set IsEdit = 1 where AcademicYearNo ='" + AcademicYearNo + "' and Semester='; "; + this.BaseRepository("CollegeMIS").ExecuteBySql(sql); + } + db.Commit(); + } + catch (Exception ex) + { + db.Rollback(); + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoomDetail/Exam_ExamPlanRoomDetailBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoomDetail/Exam_ExamRoomDetailBLL.cs similarity index 77% rename from Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoomDetail/Exam_ExamPlanRoomDetailBLL.cs rename to Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoomDetail/Exam_ExamRoomDetailBLL.cs index c4c6c2432..65f8c52e8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoomDetail/Exam_ExamPlanRoomDetailBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoomDetail/Exam_ExamRoomDetailBLL.cs @@ -12,9 +12,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 日 期：2022-04-15 15:03 /// 描 述：排考安排考场 /// - public class Exam_ExamPlanRoomDetaiBLL : Exam_ExamPlanRoomDetailIBLL + public class Exam_ExamRoomDetailBLL : Exam_ExamRoomDetailIBLL { - private Exam_ExamPlanRoomDetailService exam_ExamPlanRoomService = new Exam_ExamPlanRoomDetailService(); + private Exam_ExamRoomDetailService exam_ExamRoomDetailService = new Exam_ExamRoomDetailService(); #region 获取数据 @@ -24,11 +24,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 分页参数 /// 查询参数 /// - public IEnumerable GetPageList(Pagination pagination, string queryJson) + public IEnumerable GetPageList(Pagination pagination, string queryJson) { try { - return exam_ExamPlanRoomService.GetPageList(pagination, queryJson); + return exam_ExamRoomDetailService.GetPageList(pagination, queryJson); } catch (Exception ex) { @@ -43,11 +43,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } - public IEnumerable GetList(string queryJson) + public IEnumerable GetList(string queryJson) { try { - return exam_ExamPlanRoomService.GetList(queryJson); + return exam_ExamRoomDetailService.GetList(queryJson); } catch (Exception ex) { @@ -67,11 +67,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// 主键 /// - public Exam_ExamPlanRoomDetailEntity GetEntity(string keyValue) + public Exam_ExamRoomDetailEntity GetEntity(string keyValue) { try { - return exam_ExamPlanRoomService.GetEntity(keyValue); + return exam_ExamRoomDetailService.GetEntity(keyValue); } catch (Exception ex) { @@ -98,7 +98,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration { try { - exam_ExamPlanRoomService.DeleteEntity(keyValue); + exam_ExamRoomDetailService.DeleteEntity(keyValue); } catch (Exception ex) { @@ -120,11 +120,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 主键 /// 实体 /// - public void SaveEntity(string keyValue, Exam_ExamPlanRoomDetailEntity entity) + public void SaveEntity(string keyValue, Exam_ExamRoomDetailEntity entity) { try { - exam_ExamPlanRoomService.SaveEntity(keyValue, entity); + exam_ExamRoomDetailService.SaveEntity(keyValue, entity); } catch (Exception ex) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoomDetail/Exam_ExamPlanRoomDetailEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoomDetail/Exam_ExamRoomDetailEntity.cs similarity index 96% rename from Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoomDetail/Exam_ExamPlanRoomDetailEntity.cs rename to Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoomDetail/Exam_ExamRoomDetailEntity.cs index 2891d183e..c530d5b88 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoomDetail/Exam_ExamPlanRoomDetailEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoomDetail/Exam_ExamRoomDetailEntity.cs @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 日 期：2022-04-15 18:12 /// 描 述：排考安排考场表 /// - public class Exam_ExamPlanRoomDetailEntity + public class Exam_ExamRoomDetailEntity { #region 实体成员 /// @@ -55,7 +55,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// [Column("Semester")] - public string Semester { get; set; } + public int? Semester { get; set; } /// /// StuNo /// @@ -97,7 +97,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// [Column("ECENABLED")] - public string ECEnabled { get; set; } + public bool? ECEnabled { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoomDetail/Exam_ExamPlanRoomDetailIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoomDetail/Exam_ExamRoomDetailIBLL.cs similarity index 76% rename from Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoomDetail/Exam_ExamPlanRoomDetailIBLL.cs rename to Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoomDetail/Exam_ExamRoomDetailIBLL.cs index 2530861be..5e644a9dd 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoomDetail/Exam_ExamPlanRoomDetailIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoomDetail/Exam_ExamRoomDetailIBLL.cs @@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 日 期：2022-04-15 15:03 /// 描 述：排考安排考场 /// - public interface Exam_ExamPlanRoomDetailIBLL + public interface Exam_ExamRoomDetailIBLL { #region 获取数据 @@ -20,15 +20,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// 查询参数 /// - IEnumerable GetPageList(Pagination pagination, string queryJson); + IEnumerable GetPageList(Pagination pagination, string queryJson); - IEnumerable GetList(string queryJson); + IEnumerable GetList(string queryJson); /// /// 获取实体数据 /// /// 主键 /// - Exam_ExamPlanRoomDetailEntity GetEntity(string keyValue); + Exam_ExamRoomDetailEntity GetEntity(string keyValue); #endregion @@ -44,7 +44,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// 主键 /// 实体 - void SaveEntity(string keyValue, Exam_ExamPlanRoomDetailEntity entity); + void SaveEntity(string keyValue, Exam_ExamRoomDetailEntity entity); #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoomDetail/Exam_ExamPlanRoomDetailService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoomDetail/Exam_ExamRoomDetailService.cs similarity index 89% rename from Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoomDetail/Exam_ExamPlanRoomDetailService.cs rename to Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoomDetail/Exam_ExamRoomDetailService.cs index 1f6443949..f499dfc3a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoomDetail/Exam_ExamPlanRoomDetailService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoomDetail/Exam_ExamRoomDetailService.cs @@ -16,7 +16,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 日 期：2022-04-15 15:03 /// 描 述：排考安排考场 /// - public class Exam_ExamPlanRoomDetailService : RepositoryFactory + public class Exam_ExamRoomDetailService : RepositoryFactory { #region 获取数据 @@ -26,7 +26,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 查询参数 /// 查询参数 /// - public IEnumerable GetPageList(Pagination pagination, string queryJson) + public IEnumerable GetPageList(Pagination pagination, string queryJson) { try { @@ -35,7 +35,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration strSql.Append(@" t.* "); - strSql.Append(" FROM Exam_ExamPlanRoomDetail t "); + strSql.Append(" FROM Exam_ExamRoomDetail t "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 @@ -45,7 +45,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("EPLId", queryParam["EPLId"].ToString(), DbType.String); strSql.Append(" AND t.EPLId = @EPLId "); } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) { @@ -66,7 +66,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// 查询参数 /// 查询参数 /// - public IEnumerable GetList(string queryJson) + public IEnumerable GetList(string queryJson) { try { @@ -75,7 +75,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration strSql.Append(@" t.* "); - strSql.Append(" FROM Exam_ExamPlanRoomDetail t "); + strSql.Append(" FROM Exam_ExamRoomDetail t "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 @@ -85,7 +85,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration dp.Add("EPLId", queryParam["EPLId"].ToString(), DbType.String); strSql.Append(" AND t.EPLId = @EPLId "); } - return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp); } catch (Exception ex) { @@ -105,11 +105,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// 主键 /// - public Exam_ExamPlanRoomDetailEntity GetEntity(string keyValue) + public Exam_ExamRoomDetailEntity GetEntity(string keyValue) { try { - return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + return this.BaseRepository("CollegeMIS").FindEntity(keyValue); } catch (Exception ex) { @@ -169,7 +169,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// 主键 /// 实体 - public void SaveEntity(string keyValue, Exam_ExamPlanRoomDetailEntity entity) + public void SaveEntity(string keyValue, Exam_ExamRoomDetailEntity entity) { try { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index 26adfd724..79af3f518 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj @@ -183,10 +183,10 @@ - - - - + + + +