111

Edu.Model/ViewModel/Scroll/RB_Scroll_Appointment_ViewModel.cs

@@ -151,6 +151,11 @@ namespace Edu.Model.ViewModel.Scroll
         /// 学生列表
         /// </summary>
         public List<ScrollGuestModel> GuestList { get; set; }
+
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public string QState { get; set; }
     }
 
     /// <summary>

Edu.Module.Course/ScrollClassCommonModule.cs

@@ -669,11 +669,11 @@ namespace Edu.Module.Course
         public void CreateScrollChapter(int groupId = 100000)
         {
             //查询当前时间已结束的预约课
-            var list = scroll_AppointmentRepository.GetList(new RB_Scroll_Appointment_ViewModel() { Group_Id = groupId, CourseEndTimeStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") });
+            var list = scroll_AppointmentRepository.GetList(new RB_Scroll_Appointment_ViewModel() { Group_Id = groupId, CourseEndTimeStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), QState = "2,6" });
             if (list.Any())
             {
                 var tempList = list.Where(qitem => qitem.State == Common.Enum.Course.CourseAppointStateEnum.WaitCourse || qitem.State == Common.Enum.Course.CourseAppointStateEnum.StuCheck)?.ToList();
-                if(tempList.Any())
+                if (tempList.Any())
                 {
                     class_CheckRepository.AppointStuCheckRepository(tempList,1);
                 }

Edu.Repository/Scroll/RB_Scroll_AppointmentRepository.cs

@@ -32,6 +32,10 @@ namespace Edu.Repository.Scroll
             {
                 where += $@" and r.{nameof(RB_Scroll_Appointment_ViewModel.State)} ={(int)demodel.State}";
             }
+            if (!string.IsNullOrEmpty(demodel.QState))
+            {
+                where += $@" and r.{nameof(RB_Scroll_Appointment_ViewModel.State)} IN( {demodel.QState})";
+            }
             if (!string.IsNullOrEmpty(demodel.StartTime))
             {
                 where += $@" and r.{nameof(RB_Scroll_Appointment_ViewModel.Date)} >='{demodel.StartTime}'";
@@ -80,7 +84,7 @@ namespace Edu.Repository.Scroll
             {
                 where += $@" and r.{nameof(RB_Scroll_Appointment_ViewModel.CourseGradeNo)} ={demodel.CourseGradeNo}";
             }
-
+            
             string sql = $@" 
 SELECT r.*,c.AccountId as TeacherId,s.StuName,cou.CourseName,cou.ScrollMinNum,cou.ScrollMaxNum From RB_Scroll_Appointment r
 inner join rb_account c on r.AccountId = c.Id