Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Model/Entity/System/RB_System_Holiday.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.System
+{/// <summary>
+ /// 节假日实体
+ /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_System_Holiday
+    {
+        /// <summary>
+        /// 主键编号
+        /// </summary>        
+        public int HolidayId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 节假日开始时间
+        /// </summary>
+        public DateTime StartTime { get; set; }
+
+
+
+        /// <summary>
+        /// 节假日结束时间
+        /// </summary>
+        public DateTime EndTime { get; set; }
+
+
+        /// <summary>
+        /// 状态
+        /// </summary>        
+        public Common.Enum.DateStateEnum Status
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 1-节假日，2-工作日
+        /// </summary>
+        public int DayType { get; set; }
+        /// <summary>
+        /// 集团编号
+        /// </summary>
+        public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 学校编号
+        /// </summary>
+        public int School_Id { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+
+    }
+}

Edu.Model/ViewModel/Course/RB_Class_Plan_ViewModel.cs

@@ -134,5 +134,6 @@ namespace Edu.Model.ViewModel.Course
         /// 总的上课次数
         /// </summary>
         public int TotalPlanNum { get; set; }
+
     }
 }

Edu.Module.Course/ClassModule.cs

@@ -2873,7 +2873,7 @@ namespace Edu.Module.Course
                                 StartTime = item?.StartTime ?? "",
                                 EndTime = item?.EndTime ?? "",
                                 GuestList = guestList.Where(qitem => qitem.ClassId == subItem.ClassId)?.Select(qitem => new { qitem.GuestName }),
-                               
+
                             });
                         }
 
@@ -2899,7 +2899,7 @@ namespace Edu.Module.Course
                             subItem.EndTime,
                             CompleteProgress = -1,
                             GuestList = visitorList?.Where(qitem => qitem.ReserveClassId == subItem.ReserveClassId)?.Select(qitem => new { GuestName = qitem.VisitorName }),
-                            
+
                         });
                     }
                     var obj = new
@@ -2937,6 +2937,65 @@ namespace Edu.Module.Course
             return new { mondayList, tuesdayList, wednesdayList, thursdayList, fridayList, saturdayList, sundayList };
         }
 
+
+
+        /// <summary>
+        /// 获取班级上课记录
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<object> GetTeacherPlan(int pageIndex, int pageSize, out long rowsCount, RB_Class_Plan_ViewModel query)
+        {
+            List<object> result = new List<object>();
+            var list = class_PlanRepository.GetTeacherPlan(pageIndex, pageSize, out rowsCount, query);
+            if (list != null && list.Any())
+            {
+                var guestList = new List<RB_Order_Guest_ViewModel>();
+                var visitorList = new List<RB_Visitor_Reserve_Extend>();
+                if (list.Any(x => x.ClassType == 1))
+                {
+                    string classIds = string.Join(",", list.Where(x => x.ClassType == 1).Select(qitem => qitem.ClassId));
+                    guestList = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel() { ClassIds = classIds });
+                }
+                if (list.Any(x => x.ClassType == 2))
+                {
+                    string reserveClassIds = string.Join(",", list.Select(qitem => qitem.ClassTimeId));
+                    visitorList = visitor_ReserveRepository.GetVisitorReserveListRepository(new Model.ViewModel.Reserve.RB_Visitor_Reserve_Extend()
+                    {
+                        Q_ReserveClassIds = reserveClassIds
+                    });
+                }
+                foreach (var item in list)
+                {
+                    var currentDate = Common.ConvertHelper.FormatDate(item.ClassDate) + " " + (item.StartTime ?? "");
+                    List<object> GuestList = new List<object>();
+                   
+                    result.Add(new
+                    {
+                        Id = item?.ClassTimeId ?? 0,
+                        ClassType = item.ClassType,
+                        item.ClassId,
+                        item.ClassName,
+                        item.CourseName,
+                        item.RoomName,
+                        item.TeacherName,
+                        item.TotalPlanNum,
+                        item.Ranks,
+                        TimeStr = Common.ConvertHelper.GetTimeStr(currentDate),
+                        StartTime = item?.StartTime ?? "",
+                        EndTime = item?.EndTime ?? "",
+                        GuestList = item.ClassType==1? guestList.Where(qitem => qitem.ClassId == item.ClassId)?.Select(qitem => new { qitem.GuestName }) : visitorList?.Where(qitem => qitem.ReserveClassId == item.ClassTimeId)?.Select(qitem => new { GuestName = qitem.VisitorName }),
+
+                    });
+                }
+            }
+
+            return result;
+        }
+
         /// <summary>
         /// 查询指定计划的上课课时
         /// </summary>
@@ -3056,12 +3115,12 @@ namespace Edu.Module.Course
         /// <returns></returns>
         public List<RB_Order_Guest_ViewModel> GetTeacherStudentPage(int pageIndex, int pageSize, out long rowsCount, RB_Order_Guest_ViewModel demodel)
         {
-            var orderstudentList = order_GuestRepository.GetTeacherStudentPage( pageIndex,  pageSize, out  rowsCount,  demodel);
-            
+            var orderstudentList = order_GuestRepository.GetTeacherStudentPage(pageIndex, pageSize, out rowsCount, demodel);
+
             return orderstudentList;
 
         }
-            #endregion
+        #endregion
 
-        }
+    }
 }

Edu.Module.System/HolidayModule.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Edu.Model.Entity.System;
+using Edu.Repository.System;
+using VT.FW.DB;
+
+namespace Edu.Module.System
+{
+    public class HolidayModule
+    {
+        /// <summary>
+        /// 订单学员仓储层对象
+        /// </summary>
+        private readonly RB_System_HolidayRepository holidayRepository = new RB_System_HolidayRepository();
+
+
+
+        /// <summary>
+        /// 节假日列表
+        /// </summary>
+        /// <param name="pageIndex">当前页</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="model">查询条件</param>
+        /// <param name="count">总条数</param>
+        /// <returns></returns>
+        public List<RB_System_Holiday> GetPageList(int pageIndex, int pageSize, RB_System_Holiday model, out long count)
+        {
+            return holidayRepository.GetPageList(pageIndex, pageSize, model, out count);
+        }
+
+
+
+        /// <summary>
+        /// 判断某一天是否在节假日里
+        /// </summary>
+        /// <param name="NowDay"></param>
+        /// <returns></returns>
+        public List<RB_System_Holiday> GetDayhList(string NowDay)
+        {
+            return holidayRepository.GetDayhList(NowDay);
+        }
+
+        /// <summary>
+        /// 新增/修改节假日
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetHoliday(RB_System_Holiday model)
+        {
+            if (model.HolidayId == 0)
+            {
+                return holidayRepository.Insert(model) > 0;
+            }
+            else
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_System_Holiday.StartTime),model.StartTime},
+                    {nameof(RB_System_Holiday.EndTime),model.EndTime },
+                    {nameof(RB_System_Holiday.DayType),model.DayType }
+                };
+                return holidayRepository.Update(fileds, new WhereHelper(nameof(model.HolidayId), model.HolidayId));
+            }
+        }
+
+        /// <summary>
+        /// 删除节假日
+        /// </summary>
+        /// <param name="HolidayId"></param>
+        /// <returns></returns>
+        public bool DelHoliday(int HolidayId)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_System_Holiday.Status),1}
+                };
+            return holidayRepository.Update(fileds, new WhereHelper(nameof(HolidayId), HolidayId));
+        }
+
+    }
+}

Edu.Repository/Course/RB_ClassRepository.cs

@@ -51,7 +51,7 @@ WHERE 1=1
                 //查询未报满的班级
                 if (query.IsQuerySurplus == 1)
                 {
-                    builder.AppendFormat(" AND A.{0}>IFNULL(C.GuestNum,0) ",nameof(RB_Class_ViewModel.ClassPersion));
+                    builder.AppendFormat(" AND A.{0}>IFNULL(C.GuestNum,0) ", nameof(RB_Class_ViewModel.ClassPersion));
                 }
                 if (query.Teacher_Id > 0)
                 {
@@ -166,7 +166,8 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0} in({1}) ", nameof(RB_Class_ViewModel.ClassId), query.Q_ClassIds);
                 }
-                if (query.ClassStatus > 0) {
+                if (query.ClassStatus > 0)
+                {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.ClassStatus), (int)query.ClassStatus);
                 }
             }
@@ -584,7 +585,7 @@ WHERE 1=1 ");
                 }
                 if (query.Teacher_Id > 0)
                 {
-                    builder.AppendFormat(" AND D.{0}<>{1} ", nameof(RB_Teacher_ViewModel.TId), query.Teacher_Id);
+                    builder.AppendFormat(" AND D.{0}={1} ", nameof(RB_Teacher_ViewModel.TId), query.Teacher_Id);
                 }
             }
             return GetPage<RB_Class_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();

Edu.Repository/Course/RB_Class_PlanRepository.cs

 using Edu.Common.Enum;
 using Edu.Model.Entity.Course;
 using Edu.Model.ViewModel.Course;
+using Edu.Model.ViewModel.Reserve;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -582,9 +583,115 @@ GROUP BY A.ClassPlanId,A.ClassId ,A.ClassDate,A.ClassRoomId,A.CompleteProgress
 
             //    where d.ClassDate < b.ClassDate and c.ClassId = b.ClassId)
             //from rb_class_plan b where b.ClassPlanId = " + planId + " and b.`Status`= 0";
-            string sql = "select (select Count(0) from rb_class_plan b where b.ClassId=a.ClassId and b.ClassDate<a.ClassDate) from rb_class_plan a where ClassPlanId="+planId+" and `Status`=0";
+            string sql = "select (select Count(0) from rb_class_plan b where b.ClassId=a.ClassId and b.ClassDate<a.ClassDate) from rb_class_plan a where ClassPlanId=" + planId + " and `Status`=0";
             object obj = ExecuteScalar(sql);
             return Convert.IsDBNull(obj) ? -1 : Convert.ToDouble(obj);
         }
+
+
+
+        #region 老师-我的课表
+
+        /// <summary>
+        /// 获取班级上课记录
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Class_Plan_ViewModel> GetTeacherPlan(int pageIndex, int pageSize, out long rowsCount, RB_Class_Plan_ViewModel query)
+        {
+            StringBuilder where = new StringBuilder();
+            StringBuilder whereReserve = new StringBuilder();
+            where.AppendFormat(" AND B.ClassStatus NOT IN(1,4) ");
+            whereReserve.AppendFormat(" AND A.{0}={1} ", nameof(RB_Reserve_Class_Extend.Status), (int)DateStateEnum.Normal);
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    where.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Group_Id), query.Group_Id);
+                    whereReserve.AppendFormat(" AND A.{0}={1} ", nameof(RB_Reserve_Class_Extend.Group_Id), query.Group_Id);
+                }
+                if (!string.IsNullOrEmpty(query.StartTime))
+                {
+                    where.AppendFormat(" AND DATE_FORMAT(A.{0},'%y-%m-%d')>=DATE_FORMAT('{1}','%y-%m-%d') ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.StartTime);
+                    whereReserve.AppendFormat(" AND A.{0}>='{1}' ", nameof(RB_Reserve_Class_Extend.ClassDate), query.StartTime);
+                }
+                if (!string.IsNullOrEmpty(query.EndTime))
+                {
+                    where.AppendFormat(" AND DATE_FORMAT(A.{0},'%y-%m-%d')<=DATE_FORMAT('{1}','%y-%m-%d') ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.EndTime);
+                    whereReserve.AppendFormat(" AND A.{0}<='{1} 23:59:59' ", nameof(RB_Reserve_Class_Extend.ClassDate), query.EndTime);
+                }
+                if (query.TeacherId > 0)
+                {
+                    where.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.TeacherId), query.TeacherId);
+                    whereReserve.AppendFormat(" AND A.{0}={1} ", nameof(RB_Reserve_Class_Extend.TeacherId), query.TeacherId);
+                }
+                if (query.ClassRoomId > 0)
+                {
+                    where.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.ClassRoomId), query.ClassRoomId);
+                    whereReserve.AppendFormat(" AND A.{0}={1} ", nameof(RB_Reserve_Class_Extend.ClassRoomId), query.ClassRoomId);
+                }
+                if (query.School_Id > -1)
+                {
+                    where.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.School_Id), query.School_Id);
+                    whereReserve.AppendFormat(" AND A.{0}={1} ", nameof(RB_Reserve_Class_Extend.School_Id), query.School_Id);
+                }
+                if (query.ClassId > 0)
+                {
+                    where.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.ClassId), query.ClassId);
+                }
+            }
+
+
+            StringBuilder builder = new StringBuilder();
+            StringBuilder builderClass = new StringBuilder();
+            StringBuilder builderReserveClass = new StringBuilder();
+            builderReserveClass.AppendFormat(@"SELECT 2 as ClassType,A.ReserveClassId as ClassTimeId ,a.ClassTime as StartTime,a.EndTime,0 as ClassPlanId,0 as ClassId,a.ClassDate,a.ClassRoomId,'试听课' as ClassName,a.ClassContent as CourseName,
+a.TeacherId as Teacher_Id,IFNULL(D.TeacherName,'') AS TeacherName,IFNULL(E.RoomName,'') AS RoomName,
+IFNULL(E.SeatNum,0) AS RoomNum,0 as TotalPlanNum
+FROM RB_Reserve_Class AS A LEFT JOIN rb_teacher AS D ON A.TeacherId=D.TId
+     LEFT JOIN rb_class_room AS E ON A.ClassRoomId=E.RoomId
+WHERE 1=1 {0} ", whereReserve.ToString());
+
+            builderClass.AppendFormat(@"
+
+SELECT 1 as ClassType,F.ClassTimeId,F.StartTime,f.EndTime,A.ClassPlanId, A.ClassId,A.ClassDate,A.ClassRoomId,B.ClassName,C.CourseName,
+B.Teacher_Id,IFNULL(D.TeacherName,'') AS TeacherName,E.RoomName,IFNULL(E.SeatNum,0) AS RoomNum,plan.TotalPlanNum  
+FROM   rb_class_time as F INNER JOIN 
+rb_class_plan AS A  on F.ClassPlanId=a.ClassPlanId
+INNER JOIN rb_class AS B ON A.ClassId=B.ClassId
+      LEFT JOIN rb_course AS C ON B.CouseId=C.CourseId
+	  LEFT JOIN rb_teacher AS D ON B.Teacher_Id=D.TId
+	  LEFT JOIN rb_class_room AS E ON A.ClassRoomId=E.RoomId
+LEFT JOIN ((SELECT ClassId,COUNT(*) as TotalPlanNum from rb_class_plan where `Status`=0  GROUP BY ClassId)) as plan on plan.ClassId=a.ClassId
+WHERE 1=1 AND A.`Status`=0  {0}
+", where.ToString());
+           
+            if (query.ClassType == 1)
+            {
+                builder.AppendFormat(@"SELECT  A.ClassType,A.ClassTimeId,A.Teacher_Id,A.TeacherName,A.RoomName, a.RoomNum,A.StartTime,A.EndTime,A.ClassPlanId,A.ClassId,A.ClassDate,A.ClassRoomId,A.ClassName,A.CourseName,a.TotalPlanNum,
+(SELECT COUNT(*)   from rb_class_plan where `Status`=0 and DATE_FORMAT(ClassDate,'%Y-%m-%d') <=DATE_FORMAT(a.ClassDate,'%Y-%m-%d') and ClassId=a.ClassId) as Ranks
+FROM ( {0}    ) AS A
+GROUP BY a.ClassType,A.ClassTimeId,A.ClassPlanId,A.ClassId ,A.ClassDate,A.ClassRoomId  ", builderClass.ToString());
+            }
+            else if (query.ClassType == 2)
+            {
+                builder.AppendFormat(@"SELECT  A.ClassType,A.ClassTimeId,A.Teacher_Id,A.TeacherName,A.RoomName, a.RoomNum,A.StartTime,A.EndTime,A.ClassPlanId,A.ClassId,A.ClassDate,A.ClassRoomId,A.ClassName,A.CourseName,a.TotalPlanNum,
+(SELECT COUNT(*)   from rb_class_plan where `Status`=0 and DATE_FORMAT(ClassDate,'%Y-%m-%d') <=DATE_FORMAT(a.ClassDate,'%Y-%m-%d') and ClassId=a.ClassId) as Ranks
+FROM (  {0}  ) AS A
+GROUP BY a.ClassType,A.ClassTimeId,A.ClassPlanId,A.ClassId ,A.ClassDate,A.ClassRoomId  ", builderReserveClass.ToString());
+            }
+            else
+            {
+                builder.AppendFormat(@"SELECT  A.ClassType,A.ClassTimeId,A.Teacher_Id,A.TeacherName,A.RoomName, a.RoomNum,A.StartTime,A.EndTime,A.ClassPlanId,A.ClassId,A.ClassDate,A.ClassRoomId,A.ClassName,A.CourseName,a.TotalPlanNum,
+(SELECT COUNT(*)   from rb_class_plan where `Status`=0 and DATE_FORMAT(ClassDate,'%Y-%m-%d') <=DATE_FORMAT(a.ClassDate,'%Y-%m-%d') and ClassId=a.ClassId) as Ranks
+FROM ( {0} UNION all {1}  ) AS A
+GROUP BY a.ClassType,A.ClassTimeId,A.ClassPlanId,A.ClassId ,A.ClassDate,A.ClassRoomId  ", builderClass.ToString(), builderReserveClass.ToString());
+            }
+            return GetPage<RB_Class_Plan_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
+        }
+        #endregion
     }
 }
\ No newline at end of file

Edu.Repository/Course/RB_OrderRepository.cs

@@ -221,6 +221,10 @@ ORDER BY {orderBy}
                     where += $@" and o.{nameof(RB_Order_ViewModel.PreferPrice)} > (o.{nameof(RB_Order_ViewModel.Income)} - o.{nameof(RB_Order_ViewModel.Refund)} + o.{nameof(RB_Order_ViewModel.PlatformTax)} + o.{nameof(RB_Order_ViewModel.DiscountMoney)}) ";
                 }
             }
+            if (demodel.HelpEnterId > 0) 
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.HelpEnterId)} = {demodel.HelpEnterId}";
+            }
             string orderBy = " o.OrderId asc";
             if (demodel.Q_OrderBy == 1)
             {
@@ -260,6 +264,10 @@ where {where} order by {orderBy}
             {
                 where += $@" and o.{nameof(RB_Order_ViewModel.School_Id)} ={demodel.School_Id}";
             }
+            if (demodel.HelpEnterId > 0)
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.HelpEnterId)} = {demodel.HelpEnterId}";
+            }
             if (demodel.OrderId > 0)
             {
                 where += $@" and o.{nameof(RB_Order_ViewModel.OrderId)} ={demodel.OrderId}";

Edu.Repository/Course/RB_Order_GuestRepository.cs

@@ -252,8 +252,8 @@ WHERE {where}";
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT A.*,IFNULL(B.IsChaBan,0) AS IsChaBan,IFNULL(B.StartClassHours,0) AS StartClassHours,IFNULL(C.CourseName,'') AS CourseName,class.ClassId,class.ClassName,b.EnterID
-      ,plan.TotalPlanNum,planr.Ranks ,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId
+SELECT A.*,IFNULL(B.IsChaBan,0) AS IsChaBan,IFNULL(B.StartClassHours,0) AS StartClassHours,IFNULL(C.CourseName,'') AS CourseName,class.ClassName,b.EnterID
+      ,plan.TotalPlanNum,planr.Ranks ,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId,B.IsRenewOrder,B.RenewOrderId
 FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
 LEFT JOIN rb_class as class on class.ClassId=a.ClassId
      LEFT JOIN rb_course AS C ON (B.CourseId=C.CourseId AND B.CourseId>0 AND B.OrderType=1)

Edu.Repository/System/RB_System_HolidayRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Edu.Model.Entity.System;
+
+namespace Edu.Repository.System
+{
+   public class RB_System_HolidayRepository:BaseRepository<RB_System_Holiday>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_System_Holiday); } }
+
+
+
+        /// <summary>
+        /// 节假日列表
+        /// </summary>
+        /// <param name="pageIndex">当前页</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="model">查询条件</param>
+        /// <param name="count">总条数</param>
+        /// <returns></returns>
+        public List<RB_System_Holiday> GetPageList(int pageIndex, int pageSize, RB_System_Holiday model, out long count)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.AppendFormat(@" SELECT a.* from RB_System_Holiday as a  where 1=1");
+
+            sb.AppendFormat(" AND A.{0}={1} ", nameof(RB_System_Holiday.Status), (int)Common.Enum.DateStateEnum.Normal);
+            if (model.HolidayId > 0)
+            {
+                sb.AppendFormat(" AND A.{0}={1} ", nameof(RB_System_Holiday.HolidayId), model.HolidayId);
+            }
+
+            if (model.Group_Id > 0)
+            {
+                sb.AppendFormat(" AND A.{0}={1} ", nameof(RB_System_Holiday.Group_Id), model.Group_Id);
+            }
+            if (model.DayType > 0)
+            {
+                sb.AppendFormat(" AND A.{0}={1} ", nameof(RB_System_Holiday.DayType), model.DayType);
+            }
+            sb.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_System_Holiday.StartTime));
+            return GetPage<RB_System_Holiday>(pageIndex, pageSize, out count, sb.ToString()).ToList();
+        }
+
+
+
+        /// <summary>
+        /// 判断某一天是否在节假日里
+        /// </summary>
+        /// <param name="NowDay"></param>
+        /// <returns></returns>
+        public List<RB_System_Holiday> GetDayhList(string NowDay)
+        {
+            string sql = $@"SELECT * FROM RB_System_Holiday WHERE `Status` = 0
+	AND DATE_FORMAT(StartTime, '%y/%m/%d') <= DATE_FORMAT('{NowDay}', '%y/%m/%d') AND DATE_FORMAT(EndTime, '%y/%m/%d') >= DATE_FORMAT('{NowDay}', '%y/%m/%d') ";
+            return Get<RB_System_Holiday>(sql).ToList();
+        }
+
+    }
+}

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -1308,7 +1308,8 @@ namespace Edu.WebApi.Controllers.Course
                 Q_OrderState = base.ParmJObj.GetInt("Q_OrderState"),
                 Q_OrderBy = base.ParmJObj.GetInt("Q_OrderBy"),
                 PlatformTax = base.ParmJObj.GetDecimal("PlatformTax"),
-                EnterID = base.ParmJObj.GetInt("EnterID")
+                EnterID = base.ParmJObj.GetInt("EnterID"),
+                HelpEnterId = base.ParmJObj.GetInt("HelpEnterId",0)
             };
             demodel.Group_Id = userInfo.Group_Id;
 

Edu.WebApi/Controllers/Course/TeacherClassController.cs

@@ -135,6 +135,58 @@ namespace Edu.WebApi.Controllers.Course
             var obj = classModule.GetTeacherPlanStatisticalModule(query, ClassType: ClassType);
             return ApiResult.Success(data: obj);
         }
+
+
+
+        /// <summary>
+        /// 老师上课计划统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetClassPlanStatisticalPage()
+        {
+            var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
+            var startDate = base.ParmJObj.GetStringValue("StartTime");
+            var endDate = base.ParmJObj.GetStringValue("EndTime");
+            DateTime now = DateTime.Now;
+
+            //获取当前月的第一天
+            DateTime d1 = new DateTime(now.Year, now.Month, 1);
+            //当月最后一天
+            DateTime d2 = d1.AddMonths(1).AddDays(-1);
+            if (string.IsNullOrEmpty(startDate))
+            {
+                startDate = Common.ConvertHelper.FormatDate(d1);
+            }
+            if (string.IsNullOrEmpty(endDate))
+            {
+                endDate = Common.ConvertHelper.FormatDate(d2);
+            }
+            else
+            {
+                //if (Convert.ToDateTime(endDate) > Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now)))
+                //{
+                //    endDate = Common.ConvertHelper.FormatDate(DateTime.Now);
+                //}
+            }
+            RB_Class_Plan_ViewModel query = new RB_Class_Plan_ViewModel()
+            {
+                StartTime = startDate,
+                EndTime = endDate,
+                TeacherId = base.ParmJObj.GetInt("TeacherId"),
+                ClassRoomId = base.ParmJObj.GetInt("ClassRoomId"),
+                Group_Id = base.UserInfo.Group_Id,
+                School_Id = -1,
+                ClassId = base.ParmJObj.GetInt("ClassId"),
+                ClassType = base.ParmJObj.GetInt("ClassType")// //课程类型(0-全部,1-正常,2-试听课)
+            };
+            var result = classModule.GetTeacherPlan(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
+            pageModel.Count = rowsCount;
+            pageModel.PageData = result;
+            return ApiResult.Success(data: pageModel);
+        }
+
+
         #endregion
 
 
@@ -200,7 +252,9 @@ namespace Edu.WebApi.Controllers.Course
                     item.TotalPlanNum,
                     item.Ranks,
                     item.EnterName,
-                    item.EnterID
+                    item.EnterID,
+                    item.IsRenewOrder,
+                    item.RenewOrderId
                 });
             }
             pageModel.Count = rowsCount;