考场管理添加实际考生数量;座位表数据变动关联考场;自动安排考场关联实际参加考场人数

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamRoom/Index.js

@@ -205,6 +205,7 @@ var bootstrap = function ($, learun) {
                     { label: "座位行数", name: "SeatRows", width: 100, align: "left" },
                     { label: "座位列数", name: "SeatColumns", width: 100, align: "left" },
                     { label: "考场座位数", name: "SeatCount", width: 100, align: "left" },
+                    { label: "实际考试人数", name: "ActualNum", width: 100, align: "left" },
                     {
                         label: "是否启用", name: "EREnabled", width: 100, align: "left",
                         formatter: function (cellvalue) {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanRoom/Exam_ExamPlanRoomService.cs

@@ -364,9 +364,9 @@ where l.EPLId='{EPLId}'";
                             EPRoom.EPLId = examLesson.EPLId;
                             EPRoom.ClassroomName = room.ClassroomName;
                             EPRoom.ClassroomNo = room.ClassroomNo;
-                            EPRoom.SeatCount = room.SeatCount;
+                            EPRoom.SeatCount = room.ActualNum;
                             db.Insert(EPRoom);
-                            seatCount += room.SeatCount;
+                            seatCount += room.ActualNum;
                             if (seatCount >= examLesson.RealStuCount)
                             {
                                 break;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomEntity.cs

@@ -70,6 +70,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         [Column("ISEDIT")]
         public bool? IsEdit { get; set; }
+        /// <summary>
+        /// 实际考试人数
+        /// </summary>
+        [Column("ACTUALNUM")]
+        public int? ActualNum { get; set; }
         #endregion
 
         #region 扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoom/Exam_ExamRoomService.cs

@@ -374,6 +374,7 @@ select NEWID(),'{AcademicYearNo}','{Semester}',ClassroomName,[ClassroomNo],{Seat
                             entityList.Add(entity);
                         }
                         room[i].IsEdit = true;
+                        room[i].ActualNum = room[i].SeatCount;
                     }
                 }
                 db.Insert(entityList);

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamRoomDetail/Exam_ExamRoomDetailService.cs

@@ -198,18 +198,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
         /// <summary>
-         /// 保存实体数据（新增、修改）
-         /// </summary>
-         /// <param name="keyValue">主键</param>
-         /// <param name="entity">实体</param>
-        public void SaveSaveDetailEntity(string ClassroomNo , string AcademicYearNo,int Semester,List<Exam_ExamRoomDetailEntity> entity)
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        public void SaveSaveDetailEntity(string ClassroomNo, string AcademicYearNo, int Semester, List<Exam_ExamRoomDetailEntity> entity)
         {
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
             {
-                var del = db.FindList<Exam_ExamRoomDetailEntity>(x=>x.ClassRoomNo== ClassroomNo&& x.AcademicYearNo== AcademicYearNo&& x.Semester== Semester);
+                var del = db.FindList<Exam_ExamRoomDetailEntity>(x => x.ClassRoomNo == ClassroomNo && x.AcademicYearNo == AcademicYearNo && x.Semester == Semester);
                 db.Delete(del);
-                if (entity.Count()>0)
+                List<Exam_ExamRoomDetailEntity> enList = new List<Exam_ExamRoomDetailEntity>();
+                if (entity.Count() > 0)
                 {
                     entity.OrderBy(x => x.ECOrder);
                     for (int i = 0; i < entity.Count(); i++)
@@ -218,9 +219,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         insertEntity.ClassRoomNo = entity[i].ClassRoomNo;
                         insertEntity.ClassRoomName = entity[i].ClassRoomName;
                         insertEntity.ECEnabled = entity[i].ECEnabled;
-                        insertEntity.ECOrder = i+1;
+                        insertEntity.ECOrder = i + 1;
+                        insertEntity.Create();
+                        enList.Add(insertEntity);
                     }
                 }
+                db.Insert(enList);
+                //修改实际考试人数
+                var Update = db.FindEntity<Exam_ExamRoomEntity>(x => x.ClassroomNo == ClassroomNo && x.AcademicYearNo == AcademicYearNo && x.Semester == Semester);
+                Update.ActualNum = enList.Where(x => x.ECEnabled == true).Count();
+                db.Update(Update);
                 db.Commit();
             }
             catch (Exception ex)