约课调整

Edu.Module.Course/ScrollClassModule.cs

@@ -2532,7 +2532,7 @@ namespace Edu.Module.Course
             {
                 //查询下一次课的耗时分钟数  前端需要根据这个分钟数 
                 var chapterModel = course_ChapterRepository.GetChapterListRepository(new RB_Course_Chapter_ViewModel() { Group_Id = demodel.Group_Id, CourseId = learnModel.CourseId, ChapterNo = demodel.CourseGradeNo.ToString() }).FirstOrDefault();
-                NextAppointMinutes = chapterModel?.StudyMinutes ?? 0;
+                NextAppointMinutes = chapterModel?.StudyMinutes ?? 90;
             }
             #endregion
 
@@ -2643,7 +2643,7 @@ namespace Edu.Module.Course
             var timeList = planModel.CourseTimeList.Where(x => ("," + demodel.ShiftSort + ",").Contains("," + x.Sort + ",")).ToList();
             if (timeList.Sum(x => x.Minutes) != NextAppointMinutes)
             {
-                return "预约时长不正确";
+               // return "预约时长不正确";
             }
             if (demodel.Id <= 0 && timeList.Where(x => x.State == 2).Any())
             {

Edu.Repository/Scroll/ScheduleCourseRepository.cs

@@ -40,7 +40,8 @@ WHERE 1=1 AND B.OrderState=1  AND B.OrderType=1 AND E.ClassScrollType=2
                 || query.QCourseRate == Common.Enum.Course.CourseRateEnum.N2
                 || query.QCourseRate == Common.Enum.Course.CourseRateEnum.N1)
             {
-                builder.AppendFormat(" AND EXISTS (SELECT 1 FROM rb_course_chapter WHERE CourseId=B.CourseId AND CourseRate IN({0})) ", (int)query.QCourseRate);
+
+                builder.AppendFormat(" AND EXISTS (SELECT 1 FROM rb_course_chapter WHERE 1=1 AND (CourseId=B.CourseId OR CourseId IN(SELECT CourseId FROM rb_order_course WHERE OrderId=A.OrderId))  AND CourseRate IN({0}))  ", (int)query.QCourseRate);
             }
             else
             {

Edu.Repository/User/RB_Student_OrderGuestRepository.cs

@@ -1034,8 +1034,9 @@ WHERE o.Group_Id ={group_Id} and sog.`Status` =0 and og.GuestState NOT IN(2) and
             {
                 sql += $@" and o.ScrollSchoolId ={SchoolId}";
             }
-            //sql += string.Format(@" AND EXISTS (SELECT 1 FROM rb_course_chapter WHERE Status=0 AND CourseId= o.CourseId AND ParentId =0 AND ChapterGradeNo ={0} AND CourseRate ={1})", NextChapterGradeNo, CourseGradeId);
-            sql += string.Format(@" AND EXISTS (SELECT 1 FROM rb_course_chapter WHERE Status=0 AND CourseId= o.CourseId AND ParentId =0 AND CourseRate ={0})", CourseGradeId);
+
+            //sql += string.Format(@" AND EXISTS (SELECT 1 FROM rb_course_chapter WHERE Status=0 AND CourseId= o.CourseId AND ParentId =0 AND CourseRate ={0})", CourseGradeId);
+            sql += string.Format(@" AND EXISTS (SELECT 1 FROM rb_course_chapter WHERE Status=0  AND (CourseId= o.CourseId OR CourseId IN(SELECT CourseId FROM rb_order_course WHERE OrderId=sog.OrderId))  AND CourseRate ={0})", CourseGradeId);
             return Get<RB_Student_OrderGuest_ViewModel>(sql, parameters).ToList();
         }