页面修改

Edu.Common/Enum/Course/CourseRateEnum.cs

 using Edu.Common.Plugin;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Edu.Common.Enum.Course
 {
@@ -64,5 +61,17 @@ namespace Edu.Common.Enum.Course
         /// </summary>
         [EnumField("其他")]
         OTHER = 9,
+
+        /// <summary>
+        /// 一对一中教
+        /// </summary>
+        [EnumField("一对一中教")]
+        OneCH = 10,
+
+        /// <summary>
+        /// 一对一外教
+        /// </summary>
+        [EnumField("一对一外教")]
+        OneFor = 11,
     }
 }

Edu.Model/ViewModel/Scroll/ScheduleResult.cs

@@ -80,10 +80,20 @@ namespace Edu.Model.ViewModel.Scroll
         /// </summary>
         public string CourseName { get; set; }
 
+        /// <summary>
+        /// 课程等级
+        /// </summary>
+        public CourseRateEnum CourseRate { get; set; }
+
         /// <summary>
         /// 上课记录
         /// </summary>
         public List<PCourseItem> CourseItems { get; set; }
+
+        /// <summary>
+        /// VIP总课次
+        /// </summary>
+        public int TotalTimes { get; set; }
     }
 
 

Edu.Repository/Scroll/ScheduleCourseRepository.cs

@@ -22,14 +22,28 @@ namespace Edu.Repository.Scroll
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT A.Id AS GuestId,A.OrderId,A.GuestName,A.GuestState,IFNULL(B.EnterID,0) AS EnterID,IFNULL(D.AssistId,0) AS HeadMasterId,B.CourseId
+SELECT A.Id AS GuestId,A.OrderId,A.GuestName,A.GuestState,IFNULL(B.EnterID,0) AS EnterID,IFNULL(D.AssistId,0) AS HeadMasterId,B.CourseId,A.TotalHours AS TotalTimes
+       ,IFNULL(cs.CourseName,'') AS CourseName,IFNULL(cs.CourseRate,0) AS CourseRate
 FROM rb_order_guest AS A INNER JOIN RB_Order AS B ON A.OrderId=B.OrderId 
 	 INNER JOIN rb_class AS E ON B.ClassId=E.ClassId
      INNER JOIN rb_student_orderguest AS C ON A.Id=C.GuestId
+     INNER JOIN RB_Course AS cs ON B.CourseId=cs.CourseId
 	 LEFT JOIN rb_student_assist AS D ON (C.Student_Id=D.StuId AND D.AssistType=4)
 WHERE 1=1 AND B.OrderState=1 AND A.GuestState in(1,5) AND B.OrderType=1 AND E.ClassScrollType=2
 ");
-            builder.AppendFormat(" AND EXISTS (SELECT 1 FROM rb_course_chapter WHERE CourseId=B.CourseId AND CourseRate IN({0})) ", (int)query.QCourseRate);
+            if (query.QCourseRate == Common.Enum.Course.CourseRateEnum.N5
+                || query.QCourseRate == Common.Enum.Course.CourseRateEnum.N4
+                || query.QCourseRate == Common.Enum.Course.CourseRateEnum.N3
+                || 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);
+            }
+            else
+            {
+                builder.AppendFormat(" AND cs.CourseRate IN({0}) ", (int)query.QCourseRate);
+            }
+
 
             var list = Get<SchedulePlanResult>(builder.ToString()).ToList();
             if (list != null && list.Count > 0)
@@ -37,12 +51,11 @@ WHERE 1=1 AND B.OrderState=1 AND A.GuestState in(1,5) AND B.OrderType=1 AND E.Cl
                 string guestIds = string.Join(",", list.Select(qitem => qitem.GuestId));
                 string courseIds = string.Join(",", list.Select(qitem => qitem.CourseId));
 
-                string courseChapterSql = string.Format(@" 
-SELECT CourseId,ChapterGradeNo
-FROM rb_course_chapter
-WHERE CourseId IN({0}) AND CourseRate IN({1}) ", courseIds, (int)query.QCourseRate);
-
-               var chapterList= Get<RB_Course_Chapter>(courseChapterSql).ToList();
+//                string courseChapterSql = string.Format(@" 
+//SELECT CourseId,ChapterGradeNo
+//FROM rb_course_chapter
+//WHERE CourseId IN({0}) AND CourseRate IN({1}) ", courseIds, (int)query.QCourseRate);
+//               var chapterList= Get<RB_Course_Chapter>(courseChapterSql).ToList();
 
 
                 StringBuilder appointBuilder = new StringBuilder();

Edu.WebApi/Controllers/Course/ScheduleCourseController.cs

-using Edu.Common.API;
+using Aliyun.Acs.Core.Retry.BackoffStrategy;
+using Edu.Common.API;
 using Edu.Common.Enum.Course;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Scroll;
@@ -7,6 +8,7 @@ using Edu.Module.Course;
 using Edu.WebApi.Filter;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json.Linq;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -41,33 +43,47 @@ namespace Edu.WebApi.Controllers.Course
             }
             query.Group_Id = userInfo.Group_Id;
             var dataList = scheduleCourse.GetScheduleCourseStuListModule(query);
-            List<object> list = new List<object>();
+            List<Dictionary<string, object>> list = new List<Dictionary<string, object>>();
             foreach (var item in dataList)
             {
-                list.Add(new
+                Dictionary<string,object> jobj =new Dictionary<string, object> ();
+                jobj.Add("OrderId", item.OrderId);
+                jobj.Add("GuestId", item.GuestId);
+                jobj.Add("GuestName", item.GuestName);
+                jobj.Add("GuestState", (int)item.GuestState);
+                jobj.Add("CourseName", item.CourseName);
+                jobj.Add("CourseRate", (int)item.CourseRate);
+                jobj.Add("GuestStateName", item.GuestState.ToName());
+                jobj.Add("HeadMasterId", item.HeadMasterId);
+                jobj.Add("HeadMasterName", !string.IsNullOrEmpty(item.HeadMasterName) ? item.HeadMasterName : "");
+                jobj.Add("EnterID", item.EnterID);
+                jobj.Add("EnterName", !string.IsNullOrEmpty(item.EnterName) ? item.EnterName : "");
+                jobj.Add("TeachingMethod", (item.TeachingMethod > 0 ? item.TeachingMethod : -1));
+                jobj.Add("ClassProgress", (item.ClassProgress > 0 ? item.ClassProgress : 0));
+                jobj.Add("ScheduleStatus", (item.ScheduleStatus > 0 ? item.ScheduleStatus : -1));
+                jobj.Add("XGRemark", (!string.IsNullOrEmpty(item.XGRemark) ? item.XGRemark : ""));
+                jobj.Add("CourseItems", item?.CourseItems?.OrderBy(qitem => qitem.CourseGradeNo)?.Select(qitem => new
                 {
-                    item.OrderId,
-                    item.GuestId,
-                    item.GuestName,
-                    item.GuestState,
-                    GuestStateName = item.GuestState.ToName(),
-                    item.HeadMasterId,
-                    HeadMasterName = !string.IsNullOrEmpty(item.HeadMasterName) ? item.HeadMasterName : "",
-                    item.EnterID,
-                    EnterName = !string.IsNullOrEmpty(item.EnterName) ? item.EnterName : "",
-                    TeachingMethod = item.TeachingMethod > 0 ? item.TeachingMethod : -1,
-                    ClassProgress = item.ClassProgress > 0 ? item.ClassProgress : 0,
-                    ScheduleStatus=item.ScheduleStatus>0?item.ScheduleStatus:-1,
-                    XGRemark = !string.IsNullOrEmpty(item.XGRemark) ? item.XGRemark : "",
-                    CourseItems = item?.CourseItems?.OrderBy(qitem=>qitem.CourseGradeNo)?.Select(qitem => new
-                    {
-                        Date = Common.ConvertHelper.FormatDate(qitem.Date),
-                        qitem.State,
-                        StateName = qitem.State.ToName(),
-                        qitem.ClassCheckId,
-                        ChapterId = qitem.CourseGradeNo,
-                    })
-                });
+                    Date = Common.ConvertHelper.FormatDate(qitem.Date),
+                    qitem.State,
+                    StateName = qitem.State.ToName(),
+                    qitem.ClassCheckId,
+                    ChapterId = qitem.CourseGradeNo,
+                }));
+                if (query.QCourseRate == Common.Enum.Course.CourseRateEnum.N5
+                || query.QCourseRate == Common.Enum.Course.CourseRateEnum.N4
+                || query.QCourseRate == Common.Enum.Course.CourseRateEnum.N3
+                || query.QCourseRate == Common.Enum.Course.CourseRateEnum.N2
+                || query.QCourseRate == Common.Enum.Course.CourseRateEnum.N1)
+                {
+                    list.Add(jobj);
+                }
+                else
+                {
+                    jobj.Add("TotalTimes", item.TotalTimes);
+                    list.Add(jobj);
+                }
+           
             }
             return ApiResult.Success(data: list);
         }