页面修改

Edu.Repository/Course/RB_Order_GuestRepository.cs

@@ -60,7 +60,7 @@ namespace Edu.Repository.Course
             }
             if (demodel.QEffectStatus == 1)
             {
-                where += $@" AND (B.IsChaBan=0 OR (B.IsChaBan=1 AND B.EffectStatus IN(1,2))) ";
+                where += $@" AND (B.IsChaBan=0 OR (B.IsChaBan=1 AND B.EffectStatus IN(1) )) ";
             }
 
             string sql = $@" 

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -741,7 +741,7 @@ namespace Edu.WebApi.Controllers.Course
                 return ApiResult.Failed("数据不存在");
             }
             double totalMinutes = 0;
-            var planTimeList = classModule.GetClassTimeListRepository(new RB_Class_Time_ViewModel { ClassId = classId, ClassPlanId = classPlanId, Group_Id = base.UserInfo.Group_Id, School_Id = schoolId });
+            var planTimeList = classModule.GetClassTimeListRepository(new RB_Class_Time_ViewModel { ClassId = classId, ClassPlanId = classPlanId, Group_Id = base.UserInfo.Group_Id, School_Id = schoolId ,ClassTimeId= ClassTimeId });
             if (planTimeList != null && planTimeList.Any())
             {
                 foreach (var item in planTimeList)
@@ -754,7 +754,15 @@ namespace Edu.WebApi.Controllers.Course
                 }
             }
             var orderGuestList = classModule.GetOrderGuestListModule(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = 0, ClassId = data.ClassId,QEffectStatus=1 });
-            var checkLogList = classModule.GetClassCheckList(new RB_Class_Check_ViewModel { Group_Id = data.Group_Id, School_Id = data.School_Id, ClassId = data.ClassId, StartDate = data.ClassDate.ToString("yyyy-MM-dd HH:mm:ss"), EndDate = data.ClassDate.ToString("yyyy-MM-dd HH:mm:ss") });
+            var checkLogList = classModule.GetClassCheckList(new RB_Class_Check_ViewModel
+            {
+                Group_Id = data.Group_Id,
+                School_Id = data.School_Id,
+                ClassId = data.ClassId,
+                StartDate = data.ClassDate.ToString("yyyy-MM-dd HH:mm:ss"),
+                EndDate = data.ClassDate.ToString("yyyy-MM-dd HH:mm:ss"),
+                ClassTimeId= ClassTimeId
+            });
             List<object> guestList = new List<object>();
             foreach (var item in orderGuestList.Where(x => x.GuestState == 1))
             {
@@ -786,7 +794,7 @@ namespace Edu.WebApi.Controllers.Course
             {
                 data.TeacherName,
                 data.RoomName,
-                TotalHour = Convert.ToInt32(totalMinutes / 60),
+                TotalHour = Convert.ToDecimal(totalMinutes / 60.0),
                 ClassNum = Convert.ToInt32(totalMinutes / 45),
                 DefaultMinutes = totalMinutes,
                 ClassDate = data.ClassDate.ToString("yyyy-MM-dd"),