页面修改

Edu.Module.Course/ClassModule.cs

@@ -4155,9 +4155,10 @@ namespace Edu.Module.Course
                     foreach (var subItem in tempList)
                     {
                         var tempTimeList = timeList?.Where(qitem => qitem.ClassPlanId == subItem.ClassPlanId)?.ToList()?.OrderBy(qitem => qitem.StartTime);
-                        var currentDate = Common.ConvertHelper.FormatDate(ClassDate) + " " + (tempTimeList?.FirstOrDefault()?.StartTime ?? "");
+                        
                         foreach (var item in tempTimeList)
                         {
+                            var currentDate = Common.ConvertHelper.FormatDate(ClassDate) + " " + (item?.StartTime ?? "");
                             var tempTimeGuestList = new List<RB_Order_Guest_ViewModel>();
                             tempTimeGuestList.AddRange(guestList.Where(qitem => qitem.ClassId == subItem.ClassId && (qitem.GuestState == GuestStateEnum.Normal || qitem.GuestState == GuestStateEnum.StopClassesApplyIng || ((qitem.GuestState == GuestStateEnum.StopClasses || qitem.GuestState == GuestStateEnum.Graduate) && qitem.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(qitem.ChangeEffectTime)) >= subItem.ClassDate))));
                             tempTimeGuestList.AddRange(tempGuestList.Where(qitem => qitem.ClassId == subItem.ClassId && item.ClassTimeId == qitem.ClassTimeId && (qitem.GuestState == GuestStateEnum.Normal || qitem.GuestState == GuestStateEnum.StopClassesApplyIng || ((qitem.GuestState == GuestStateEnum.StopClasses || qitem.GuestState == GuestStateEnum.Graduate) && qitem.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(qitem.ChangeEffectTime)) >= subItem.ClassDate))));

Edu.Module.Duty/VisitorReserveModule.cs

@@ -333,7 +333,7 @@ namespace Edu.Module.Duty
             #endregion
 
             #region 验证教室
-            if (CheckClassRoomModule( chooseDateTime, chooseEndTime, model,out string roomMessage))
+            if (CheckClassRoomModule(chooseDateTime, chooseEndTime, model,out string roomMessage))
             {
                 message = roomMessage;
                 return false;
@@ -455,7 +455,7 @@ namespace Edu.Module.Duty
                     var endTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(item.ClassDate) + " " + item.EndTime);
                     if (chooseDateTime < endTime && chooseEndTime > startTime)
                     {
-                        message = string.Format("此教师已有{0}的正常上课计划!请重新选择时间", Common.ConvertHelper.FormatDate(chooseDateTime));
+                        message = string.Format("此教师已有 {0} {1}-{2}【{3}】正常上课计划!请重新选择时间", Common.ConvertHelper.FormatDate(model.ClassDate), item.StartTime, item.EndTime, item.ClassName);
                         return true;
                     }
                 }
@@ -470,7 +470,7 @@ namespace Edu.Module.Duty
             };
             if (CheckReserveClassExistsModule(checkModel))
             {
-                message = string.Format("此教师已有{0}的试听课计划!请重新选择时间", Common.ConvertHelper.FormatDate(chooseDateTime));
+                message = string.Format("此教师已有 {0} {1}-{2} 试听课计划!请重新选择时间", Common.ConvertHelper.FormatDate(model.ClassDate), model.ClassTime, model.EndTime);
                 return true;
             }
             return false;
@@ -502,7 +502,7 @@ namespace Edu.Module.Duty
                     var endTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(item.ClassDate) + " " + item.EndTime);
                     if (chooseDateTime < endTime && chooseEndTime > startTime)
                     {
-                        RoomMessage = string.Format("此教室已有{0}的正常上课计划!请重新选择时间", Common.ConvertHelper.FormatDate(chooseDateTime));
+                        RoomMessage = string.Format("此教室已有 {0} {1}-{2}【{3}】正常上课计划!请重新选择时间", Common.ConvertHelper.FormatDate(model.ClassDate), item.StartTime, item.EndTime, item.ClassName);
                         return true;
                     }
                 }
@@ -517,7 +517,7 @@ namespace Edu.Module.Duty
             };
             if (CheckReserveClassExistsModule(checkModel))
             {
-                RoomMessage = string.Format("此教室已有{0}的试听课计划!请重新选择时间", Common.ConvertHelper.FormatDate(chooseDateTime));
+                RoomMessage = string.Format("此教室已有 {0} {1}-{2} 试听课计划!请重新选择时间", Common.ConvertHelper.FormatDate(model.ClassDate), model.ClassTime, model.EndTime);
                 return true;
             }
             return false;