解决冲突

Edu.Common/Enum/Finance/ReceiptTypeEnum.cs

+using Edu.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Common.Enum.Finance
+{
+    /// <summary>
+    /// 单据类型
+    /// </summary>
+    public enum ReceiptTypeEnum
+    {
+        /// <summary>
+        /// 调课
+        /// </summary>
+        [EnumField("调课")]
+        ChangeClass = 1,
+    }
+}

Edu.Model/Entity/Course/RB_Order.cs

@@ -278,5 +278,10 @@ namespace Edu.Model.Entity.Course
         /// 留学确认时间（确认后 才能发提成  才进报表）
         /// </summary>
         public DateTime? LXConfirmDate { get; set; }
+
+        ///
+        /// 是否续班订单(1-是)
+        /// </summary>
+        public int IsRenewOrder { get; set; }
     }
 }

Edu.Model/Entity/EduTask/RB_Change_ClassPlan.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.Entity.EduTask
+{
+    /// <summary>
+    /// 上课计划调整实体类
+    /// </summary>
+    public class RB_Change_ClassPlan
+    {
+		/// <summary>
+		/// 主键(调课编号)
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 班级编号
+		/// </summary>
+		public int ClassId { get; set; }
+
+		/// <summary>
+		/// 课程编号
+		/// </summary>
+		public int CourseId { get; set; }
+
+		/// <summary>
+		/// 调动类型(1-课程，2-老师，3-教室)
+		/// </summary>
+		public int ChangeType { get; set; }
+
+		/// <summary>
+		/// 调动选项(1-固定日期，2-全局调整)
+		/// </summary>
+		public int MoveType { get; set; }
+
+		/// <summary>
+		/// 集团编号
+		/// </summary>
+		public int Group_Id { get; set; }
+
+		/// <summary>
+		/// 学校编号
+		/// </summary>
+		public int School_Id { get; set; }
+
+		/// <summary>
+		/// 创建人
+		/// </summary>
+		public int CreateBy { get; set; }
+
+		/// <summary>
+		/// 创建时间
+		/// </summary>
+		public DateTime CreateTime { get; set; }
+
+		/// <summary>
+		/// 修改人
+		/// </summary>
+		public int UpdateBy { get; set; }
+
+		/// <summary>
+		/// 更新时间
+		/// </summary>
+		public DateTime UpdateTime { get; set; }
+
+		/// <summary>
+		/// 原数据
+		/// </summary>
+		public string SourceData { get; set; }
+
+		/// <summary>
+		/// 目标数据
+		/// </summary>
+		public string TargetData { get; set; }
+	}
+}

Edu.Model/Entity/EduTask/RB_Education_Receipt.cs

+using Edu.Common.Enum.Finance;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.EduTask
+{
+    /// <summary>
+    /// 教务单据实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Education_Receipt
+    {
+		/// <summary>
+		/// 主键(教务单据编号)
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 单据标题
+		/// </summary>
+		public string Title { get; set; }
+
+		/// <summary>
+		/// 单据类型
+		/// </summary>
+		public ReceiptTypeEnum ReceiptType { get; set; }
+
+		/// <summary>
+		/// 关联编号(根据单据类型匹配)
+		/// </summary>
+		public int RelationId { get; set; }
+
+		/// <summary>
+		/// 集团编号
+		/// </summary>
+		public int Group_Id { get; set; }
+
+		/// <summary>
+		/// 学校编号
+		/// </summary>
+		public int School_Id { get; set; }
+
+		/// <summary>
+		/// 创建人
+		/// </summary>
+		public int CreateBy { get; set; }
+
+		/// <summary>
+		/// 创建时间
+		/// </summary>
+		public DateTime CreateTime { get; set; }
+
+		/// <summary>
+		/// 修改人
+		/// </summary>
+		public int UpdateBy { get; set; }
+
+		/// <summary>
+		/// 更新时间
+		/// </summary>
+		public DateTime UpdateTime { get; set; }
+
+		/// <summary>
+		/// 审核状态(见枚举)
+		/// </summary>
+		public WFRrocessStatus VerifyStatus { get; set; }
+	}
+}

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/Class_LessonPlan_ViewModel.cs

@@ -78,7 +78,7 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public List<RB_Class_LessonPlan_ViewModel> LessonPlanList { get; set; }
 
-        public RB_Course_Chapter_ViewModel Chapter { get; set; }
+        public List<ChapterTree_ViewModel> Chapter { get; set; }
 
         public string CourseName { get; set; }
 

Edu.Model/ViewModel/Course/RB_Class_Plan_ViewModel.cs

@@ -127,6 +127,13 @@ namespace Edu.Model.ViewModel.Course
         /// <summary>
         /// 第几次上课
         /// </summary>
-       public object Ranks { get; set; }
+        public object Ranks { get; set; }
+
+
+        /// <summary>
+        /// 总的上课次数
+        /// </summary>
+        public int TotalPlanNum { get; set; }
+
     }
 }

Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs

@@ -216,6 +216,20 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public int IsQuerySurplus { get; set; }
 
+        /// <summary>
+        /// 总的上课次数
+        /// </summary>
+        public int TotalPlanNum { get; set; }
+
+        /// <summary>
+        /// 已上课次数
+        /// </summary>
+        public int UsePlanNum { get; set; }
+
+        /// <summary>
+        /// 是否查询剩余的上课计划
+        /// </summary>
+        public int IsQuerySurplusPlan { get; set; }
     }
 
     /// <summary>

Edu.Model/ViewModel/Course/RB_Order_Guest_ViewModel.cs

@@ -25,6 +25,20 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public int EnterID { get; set; }
 
+        /// <summary>
+        /// 业务员
+        /// </summary>
+        public string EnterName { get; set; }
+        /// <summary>
+        /// 班级名称
+        /// </summary>
+        public string ClassName { get; set; }
+
+        /// <summary>
+        /// 老师id
+        /// </summary>
+        public int Teacher_Id { get; set; }
+
         /// <summary>
         /// rb_student表的id
         /// </summary>
@@ -151,5 +165,23 @@ namespace Edu.Model.ViewModel.Course
         /// 前置订单编号
         /// </summary>
         public int UpOrderId { get; set; }
+
+        /// <summary>
+        /// 总上课次数
+        /// </summary>
+        public int TotalPlanNum { get; set; }
+
+        /// <summary>
+        /// 已上课次数
+        /// </summary>
+        public int Ranks { get; set; }
+        /// 是否续班订单
+        /// </summary>
+        public int IsRenewOrder { get; set; }
+
+        /// <summary>
+        /// 续课订单编号
+        /// </summary>
+        public int RenewOrderId { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/Course/RB_Order_ViewModel.cs

@@ -190,5 +190,10 @@ namespace Edu.Model.ViewModel.Course
                 return str;
             }
         }
+    
+        /// <summary>
+        /// 园学员编号【续课使用】
+        /// </summary>
+        public int OldGuestId { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/EduTask/EducationReceiptQuery.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.EduTask
+{
+    /// <summary>
+    /// 教务单据查询实体类
+    /// </summary>
+    public class EducationReceiptQuery
+    {
+		/// <summary>
+		/// 主键(教务单据编号)
+		/// </summary>
+		public string QIds { get; set; }
+
+		/// <summary>
+		/// 单据标题
+		/// </summary>
+		public string Title { get; set; }
+
+		/// <summary>
+		/// 单据类型
+		/// </summary>
+		public int ReceiptType { get; set; }
+
+		/// <summary>
+		/// 集团编号
+		/// </summary>
+		public int Group_Id { get; set; }
+
+		/// <summary>
+		/// 学校编号
+		/// </summary>
+		public int School_Id { get; set; }
+
+		/// <summary>
+		/// 创建人
+		/// </summary>
+		public int CreateBy { get; set; }
+
+	 
+		/// <summary>
+		/// 审核状态(见枚举)
+		/// </summary>
+		public int VerifyStatus { get; set; }
+
+		/// <summary>
+		/// 开始时间
+		/// </summary>
+		public string StartTime { get; set; }
+
+		/// <summary>
+		/// 结束时间
+		/// </summary>
+		public string EndTime { get; set; }
+	}
+}

Edu.Model/ViewModel/EduTask/RB_Change_ClassPlan_ViewModel.cs

+using Edu.Model.Entity.EduTask;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.EduTask
+{
+    /// <summary>
+    /// 上课计划调整视图实体类
+    /// </summary>
+    public class RB_Change_ClassPlan_ViewModel : RB_Change_ClassPlan
+    {
+
+    }
+
+    public class ChangePlanItem
+    {
+        /// <summary>
+        /// 上课计划编号
+        /// </summary>
+        public int ClassPlanId { get; set; }
+
+        /// <summary>
+        /// 上课时间
+        /// </summary>
+        public DateTime ClassDate { get; set; }
+
+        /// <summary>
+        /// 老师编号
+        /// </summary>
+        public int TeacherId { get; set; }
+
+        /// <summary>
+        /// 教室编号
+        /// </summary>
+        public int ClassRoomId { get; set; }
+
+
+    }
+}

Edu.Model/ViewModel/EduTask/RB_Education_Receipt_ViewModel.cs

+using Edu.Model.Entity.EduTask;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.EduTask
+{
+    /// <summary>
+    /// 教务单据视图实体类
+    /// </summary>
+    public class RB_Education_Receipt_ViewModel : RB_Education_Receipt
+    {
+
+    }
+}

Edu.Module.Course/CourseModule.cs

@@ -568,9 +568,15 @@ namespace Edu.Module.Course
             return treeList;
         }
 
-        public RB_Course_Chapter_ViewModel GetMatchHoursChapterModule(int courseId,double currentHours) 
+        public List<ChapterTree_ViewModel> GetMatchHoursChapterModule(int courseId,double currentHours) 
         {
-            return  chapterRepository.GetMatchHoursChapterRepository(courseId,currentHours);
+            var list = chapterRepository.GetMatchHoursChapterRepository(courseId, currentHours);
+            list.ForEach(x =>
+            {
+                x.SerialNumber = int.Parse(x.ChapterNo.Replace(".", ""));
+            });
+            List<ChapterTree_ViewModel> treeList = GetChapterChild(list, 0);
+            return treeList;
         }
 
         /// <summary>

Edu.Module.Course/OrderModule.cs

@@ -309,7 +309,7 @@ namespace Edu.Module.Course
         /// <param name="userInfo"></param>
         /// <returns></returns>
         [TransactionCallHandler]
-        public virtual bool SetClassOrder(RB_Order_ViewModel demodel, UserInfo userInfo, bool isEditOrder, out string message)
+        public virtual bool SetClassOrderModule(RB_Order_ViewModel demodel, UserInfo userInfo, bool isEditOrder, out string message)
         {
             bool flag = false;
             message = "";
@@ -693,6 +693,53 @@ namespace Edu.Module.Course
                     SetOrderGuestInfo(guestModel, out string Nmessage);
                 }
                 #endregion
+
+                #region 续课订单 添加学员名单
+                if (flag && demodel.RenewOrderId > 0 && demodel.OldGuestId>0)
+                {
+                    var oldGuestModel = order_GuestRepository.GetEntity(demodel.OldGuestId);
+                    var guestModel = new RB_Order_Guest_ViewModel()
+                    {
+                        Id = 0,
+                        OrderId = demodel.OrderId,
+                        ClassId = demodel.ClassId,
+                        GuestName = oldGuestModel?.GuestName ?? "",
+                        GuestState = 1,
+                        Profession = oldGuestModel?.Profession??"",
+                        Sex = oldGuestModel?.Sex??1,
+                        Age = oldGuestModel?.Age ?? 18,
+                        Mobile = oldGuestModel?.Mobile ?? "",
+                        Basics = oldGuestModel?.Basics,
+                        Education = oldGuestModel?.Education?? GuestEducationEnum.N2,
+                        GuestSource = demodel.OrderSource,
+                        LearningGoals = oldGuestModel?.LearningGoals??GuestLearningGoalsEnum.Love,
+                        Contact = oldGuestModel?.Contact??"",
+                        ContactMobile = oldGuestModel?.ContactMobile?? "",
+                        Status = 0,
+                        Group_Id = demodel.Group_Id,
+                        School_Id = demodel.School_Id,
+                        CreateBy = demodel.CreateBy,
+                        CreateTime = demodel.CreateTime,
+                        UpdateBy = demodel.UpdateBy,
+                        UpdateTime = demodel.UpdateTime,
+                        DropOutRemark = "",
+                        IDCard = oldGuestModel?.IDCard??"",
+                        Domicile = oldGuestModel?.Domicile ?? "",
+                        ContactAddress = oldGuestModel?.ContactAddress ?? "",
+                        SourceId = 0,
+                        GraduatedSchool = oldGuestModel?.GraduatedSchool ?? "",
+                        GraduatedMajor = oldGuestModel?.GraduatedMajor ?? "",
+                        VolunteerMajor = oldGuestModel?.VolunteerMajor ?? "",
+                        Price = 0,
+                        StudyRemark = "",
+                        TotalHours = Convert.ToInt32(courseModel.ClassHours),
+                        CompleteHours = 0,
+                        MakeUpHours = 0,
+                        StuIcon = "",
+                    };
+                    SetOrderGuestInfo(guestModel, out string Nmessage);
+                }
+                #endregion
             }
 
             #region 写日志
@@ -814,7 +861,7 @@ namespace Edu.Module.Course
         /// <param name="userInfo"></param>
         /// <returns></returns>
         [TransactionCallHandler]
-        public virtual bool SetStudyOrder(RB_Order_ViewModel demodel, UserInfo userInfo, out string message)
+        public virtual bool SetStudyOrderModule(RB_Order_ViewModel demodel, UserInfo userInfo, out string message)
         {
             bool flag = false;
             message = "";

Edu.Module.Course/StudentBillModule.cs

@@ -40,11 +40,7 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly RB_Student_BackRecordRepository student_BackRecordRepository = new RB_Student_BackRecordRepository();
 
-        /// <summary>
-        /// 课程优惠仓储层对象
-        /// </summary>
-        private readonly RB_Course_PreferentialRepository course_PreferentialRepository = new RB_Course_PreferentialRepository();
-
+ 
         /// <summary>
         /// 旅客表仓储层对象
         /// </summary>
@@ -95,6 +91,11 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly ClassModule classModule = new ClassModule();
 
+        /// <summary>
+        /// 课程优惠信息
+        /// </summary>
+        private readonly RB_Course_PreferentialRepository   course_PreferentialRepository = new RB_Course_PreferentialRepository();
+
         /// <summary>
         /// 获取学员退课单据分页列表
         /// </summary>
@@ -953,137 +954,7 @@ namespace Edu.Module.Course
             return msg;
         }
 
-        /// <summary>
-        /// 学员续课订单
-        /// </summary>
-        /// <param name="orderId"></param>
-        /// <param name="guestId"></param>
-        /// <param name="orderModel">订单实体类</param>
-        /// <param name="message">提示信息</param>
-        /// <returns></returns>
-        public virtual bool RenewOrderModule(int orderId, int guestId, RB_Order_ViewModel orderModel, out string message)
-        {
-            bool flag = false;
-            message = "";
-            var oldOrderModel = orderRepository.GetEntity(orderId);
-            if (oldOrderModel == null)
-            {
-                message = "原订单不存在!请核实在重新申请!";
-                flag = false;
-                return flag;
-            }
-            if (oldOrderModel.OrderState == OrderStateEnum.Cancel)
-            {
-                message = "原订单已取消!请核实在重新申请!";
-                flag = false;
-                return flag;
-            }
-            var oldGuestModel = order_GuestRepository.GetEntity(guestId);
-            if (oldGuestModel == null)
-            {
-                message = "原旅客信息不存在!请核实在重新申请!";
-                flag = false;
-                return flag;
-            }
-            if (oldGuestModel.GuestState != 1)
-            {
-                message = "原旅客状态不正确!请核实在重新申请!";
-                flag = false;
-                return flag;
-            }
-            var classModel = classRepository.GetEntity(orderModel.ClassId);
-            orderModel.School_Id = classModel?.School_Id ?? 0;
-            orderModel.EnterID = oldOrderModel.EnterID;
-            orderModel.OrderState = OrderStateEnum.Normal;
-            orderModel.OrderSource = oldOrderModel.OrderSource;
-            orderModel.OrderForm = oldOrderModel.OrderForm;
-            int CourseId = classModel?.CouseId ?? 0;
-
-            #region 计算订单提成信息       
-            if (CourseId > 0)
-            {
-                //获取课程优惠
-                var coursePreferentialList = course_PreferentialRepository.GetCoursePreferentialListRepostory(new RB_Course_Preferential_Extend()
-                {
-                    CourseId = CourseId
-                });
-                RB_Course_Preferential_Extend coursePreferentialModel = null;
-                if (coursePreferentialList != null && coursePreferentialList.Count > 0)
-                {
-                    if (orderModel.GuestNum == 1)
-                    {
-                        coursePreferentialModel = coursePreferentialList?.Where(qitem => qitem.PriceDiscountType == CoursePriceDiscountEnum.SingleJoin)?.FirstOrDefault();
-                    }
-                    if (orderModel.GuestNum >= 2)
-                    {
-                        coursePreferentialModel = coursePreferentialList?.Where(qitem => qitem.PriceDiscountType == CoursePriceDiscountEnum.DoubleJoin)?.FirstOrDefault();
-                    }
-
-                    #region 记录提成信息
-                    if (coursePreferentialModel == null)
-                    {
-                        coursePreferentialModel = coursePreferentialList.FirstOrDefault();
-                    }
-                    orderModel.CommissionType = coursePreferentialModel?.SaleCommissionType ?? 0;
-                    orderModel.CommissionRate = coursePreferentialModel?.SaleCommissionMoney ?? 0;
-                    orderModel.CommissionTypeTH = coursePreferentialModel?.B2BCommissionType ?? 0;
-                    orderModel.CommissionRateTH = coursePreferentialModel?.B2BCommissionMoney ?? 0;
-                    if (coursePreferentialModel != null)
-                    {
-                        orderModel.CommissionRemark = "使用优惠Id:" + coursePreferentialModel.Id + " 返佣类型:" + orderModel.CommissionType + " 返佣比例/金额:" + orderModel.CommissionRate + " 同行返佣类型:" + orderModel.CommissionTypeTH + " 同行返佣比例/金额:" + orderModel.CommissionRateTH;
-                    }
-                    #endregion
-                }
-            }
-            #endregion
-
-            //新增订单
-            var newOrderId = orderRepository.Insert(orderModel);
-            orderModel.OrderId = newOrderId;
-            flag = newOrderId > 0;
-            if (flag)
-            {
-                //新增旅客
-                var guestModel = new RB_Order_Guest()
-                {
-                    OrderId = orderModel.OrderId,
-                    ClassId = orderModel.ClassId,
-                    GuestName = oldGuestModel.GuestName,
-                    GuestState = 1,
-                    Profession = oldGuestModel?.Profession ?? "",
-                    Sex = oldGuestModel?.Sex ?? 1,
-                    Age = oldGuestModel?.Age ?? 0,
-                    Mobile = oldGuestModel?.Mobile ?? "",
-                    Basics = oldGuestModel?.Basics ?? "",
-                    Education = oldGuestModel?.Education ?? 0,
-                    GuestSource = oldGuestModel?.GuestSource ?? 0,
-                    LearningGoals = oldGuestModel?.LearningGoals ?? 0,
-                    Contact = oldGuestModel?.Contact ?? "",
-                    ContactMobile = oldGuestModel?.ContactMobile ?? "",
-                    Status = 0,
-                    Group_Id = orderModel.Group_Id,
-                    School_Id = orderModel?.School_Id ?? 0,
-                    CreateBy = orderModel.CreateBy,
-                    CreateTime = orderModel.CreateTime,
-                    UpdateBy = orderModel.UpdateBy,
-                    UpdateTime = orderModel.UpdateTime,
-                    DropOutRemark = "",
-                };
-                var newGuestId = order_GuestRepository.Insert(guestModel);
-                guestModel.Id = newGuestId;
-                flag = newGuestId > 0;
-            }
-            if (flag)
-            {
-                Dictionary<string, object> orderFileds = new Dictionary<string, object>()
-                {
-                    {nameof(RB_Order.RenewOrderId), newOrderId}
-                };
-                flag = orderRepository.Update(orderFileds, new WhereHelper(nameof(RB_Order.OrderId), orderId));
-            }
-            return flag;
-        }
-
+   
         /// <summary>
         /// 获取续费课程列表
         /// </summary>
@@ -1096,8 +967,33 @@ namespace Edu.Module.Course
         {
             List<object> list = new List<object>();
             var classList = classModule.GetClassPageListModule(pageIndex, pageSize, out rowsCount, query, isGetStepPrice: true);
+            List<RB_Course_Preferential_Extend> coursePriceList = new List<RB_Course_Preferential_Extend>();
+            if (classList != null && classList.Count > 0)
+            {
+                string courseIds = string.Join(",", classList.Select(qitem => qitem.CouseId));
+                coursePriceList= course_PreferentialRepository.GetCoursePreferentialListRepostory(new RB_Course_Preferential_Extend()
+                {
+                    QCourseIds = courseIds
+                });
+            }
             foreach (var item in classList)
             {
+                var priceModel = coursePriceList?.Where(qitem => qitem.CourseId == item.CouseId && qitem.PriceDiscountType == CoursePriceDiscountEnum.Renewal)?.FirstOrDefault();
+                decimal SellPrice = item.SellPrice;
+                decimal OriginalPrice = item.SellPrice;
+                if (priceModel != null)
+                {
+                    if (priceModel.PriceType == 0)
+                    {
+                        SellPrice = Math.Round(SellPrice * (100 - priceModel.PriceMoney) / 100,2);
+                        OriginalPrice = Math.Round(SellPrice * (100 - priceModel.PriceMoney) / 100,2);
+                    }
+                    else
+                    {
+                        SellPrice = Math.Round(SellPrice - priceModel.PriceMoney,2);
+                        OriginalPrice = Math.Round(SellPrice - priceModel.PriceMoney, 2);
+                    }
+                }
                 var obj = new
                 {
                     item.ClassId,
@@ -1107,8 +1003,8 @@ namespace Edu.Module.Course
                     item.TeacherName,
                     item.RoomName,
                     OpenTime = Common.ConvertHelper.FormatDate(item.OpenTime),
-                    item.OriginalPrice,
-                    item.SellPrice,
+                    OriginalPrice,
+                    SellPrice,
                     item.ClassPersion,
                     item.OrderStudentCount,
                     item.ClassStepPriceList,

Edu.Module.EduTask/ChangeClassPlanModule.cs

+using Edu.Model.ViewModel.EduTask;
+using Edu.Repository.EduTask;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Module.EduTask
+{
+    /// <summary>
+    /// 调课计划处理类
+    /// </summary>
+    public class ChangeClassPlanModule
+    {
+        /// <summary>
+        /// 调课计划仓储层对象
+        /// </summary>
+        private readonly RB_Change_ClassPlanRepository change_ClassPlanRepository = new RB_Change_ClassPlanRepository();
+
+        /// <summary>
+        /// 获取调课计划列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Change_ClassPlan_ViewModel> GetChangeClassPlanListModule(RB_Change_ClassPlan_ViewModel query)
+        {
+            return change_ClassPlanRepository.GetChangeClassPlanListRepository(query);
+        }
+
+
+        /// <summary>
+        /// 新增修改调课计划
+        /// </summary>
+        /// <returns></returns>
+        public bool SetChangeClassPlanModule(RB_Change_ClassPlan_ViewModel extModel)
+        {
+            bool flag = false;
+            if (extModel.Id > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Change_ClassPlan_ViewModel.ChangeType),extModel.ChangeType },
+                    {nameof(RB_Change_ClassPlan_ViewModel.MoveType),extModel.MoveType },
+                    {nameof(RB_Change_ClassPlan_ViewModel.SourceData),extModel.SourceData },
+                    {nameof(RB_Change_ClassPlan_ViewModel.TargetData),extModel.TargetData },
+                    {nameof(RB_Change_ClassPlan_ViewModel.UpdateBy),extModel.UpdateBy },
+                    {nameof(RB_Change_ClassPlan_ViewModel.UpdateTime),extModel.UpdateTime },
+                };
+                flag = change_ClassPlanRepository.Update(fileds, new WhereHelper(nameof(RB_Change_ClassPlan_ViewModel.Id), extModel.Id));
+            }
+            else
+            {
+                var newId = change_ClassPlanRepository.Insert(extModel);
+                extModel.Id = newId;
+                flag = newId > 0;
+            }
+            return flag;
+        }
+    }
+}

Edu.Module.EduTask/Edu.Module.EduTask.csproj

+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Edu.Repository\Edu.Repository.csproj" />
+  </ItemGroup>
+
+</Project>

Edu.Module.EduTask/EducationReceiptModule.cs

+using Edu.Model.ViewModel.EduTask;
+using Edu.Repository.EduTask;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Module.EduTask
+{
+    /// <summary>
+    /// 教务单据处理类
+    /// </summary>
+    public class EducationReceiptModule
+    {
+        /// <summary>
+        /// 教务单据仓储层
+        /// </summary>
+        private readonly RB_Education_ReceiptRepository education_ReceiptRepository = new RB_Education_ReceiptRepository();
+
+        /// <summary>
+        /// 获取教务单据分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public object GetEducationReceiptPageModule(int pageIndex, int pageSize, out long rowsCount, EducationReceiptQuery query)
+        {
+            var list = education_ReceiptRepository.GetEducationReceiptPageRepository(pageIndex, pageSize, out rowsCount, query);
+            return list;
+        }
+    }
+}
+ 
\ No newline at end of file

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,11 @@ 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)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Teacher_Id), query.Teacher_Id);
                 }
             }
             return Get<RB_Class_ViewModel>(builder.ToString()).ToList();
@@ -162,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);
                 }
             }
@@ -242,6 +247,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}<>{1} ", nameof(RB_Class_ViewModel.ClassId), query.OldClassId);
                 }
+                if (query.Teacher_Id > 0)
+                {
+                    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();
         }
@@ -498,5 +507,89 @@ where a.`Status`=0  and a.IsSubscribe=1 and ClassStatus in(1,2)");
             var obj = ExecuteScalar(sql);
             return obj == null ? 0 : Convert.ToInt32(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_ViewModel> GetTeacherClassPageList(int pageIndex, int pageSize, out long rowsCount, RB_Class_ViewModel query)
+        {
+            var parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT plan.TotalPlanNum,ySplan.UsePlanNum,A.*,B.CourseName,C.AssistName,IFNULL(C.AssistIcon,'') AS AssistIcon,D.TeacherName,IFNULL(D.TeacherHead,'') AS TeacherHead
+       ,E.SName AS SchoolName,IFNULL(F.RoomName,'') AS RoomName
+FROM rb_class AS A LEFT JOIN rb_course AS B ON A.CouseId=B.CourseId
+     LEFT JOIN rb_assist AS C ON A.Assist_Id=C.AId
+     LEFT JOIN rb_teacher AS D ON A.Teacher_Id=D.TId
+     LEFT JOIN rb_school AS E ON A.School_Id=E.SId
+     LEFT JOIN rb_class_room AS F ON A.ClassRoomId=F.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
+LEFT JOIN ((SELECT ClassId,COUNT(*) as UsePlanNum from rb_class_plan where `Status`=0 and DATE_FORMAT(ClassDate,'%Y-%m-%d') <=DATE_FORMAT(NOW(),'%Y-%m-%d') GROUP BY ClassId)) as ySplan on ySplan.ClassId=a.ClassId
+WHERE 1=1 ");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Group_Id), query.Group_Id);
+                }
+                if (query.School_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.School_Id), query.School_Id);
+                }
+                if (query.Status >= 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.Status), (int)query.Status);
+                }
+                if (query.ClassStatus > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_ViewModel.ClassStatus), (int)query.ClassStatus);
+                }
+                if (!string.IsNullOrWhiteSpace(query.ClassName))
+                {
+                    builder.AppendFormat(" AND A.{0} LIKE @ClassName ", nameof(RB_Class_ViewModel.ClassName));
+                    parameters.Add("ClassName", "%" + query.ClassName.Trim() + "%");
+                }
+                if (!string.IsNullOrWhiteSpace(query.CourseName))
+                {
+                    builder.AppendFormat(" AND B.{0} LIKE @CourseName ", nameof(RB_Course_ViewModel.CourseName));
+                    parameters.Add("CourseName", "%" + query.CourseName.Trim() + "%");
+                }
+                if (!string.IsNullOrWhiteSpace(query.AssistName))
+                {
+                    builder.AppendFormat(" AND C.{0} LIKE @AssistName ", nameof(RB_Assist_ViewModel.AssistName));
+                    parameters.Add("AssistName", "%" + query.AssistName.Trim() + "%");
+                }
+                if (!string.IsNullOrWhiteSpace(query.TeacherName))
+                {
+                    builder.AppendFormat(" AND D.{0} LIKE @TeacherName ", nameof(RB_Teacher_ViewModel.TeacherName));
+                    parameters.Add("TeacherName", "%" + query.TeacherName.Trim() + "%");
+                }
+                if (!string.IsNullOrEmpty(query.StartTime))
+                {
+                    builder.AppendFormat(" AND A.{0}>='{1}' ", nameof(RB_Class_ViewModel.OpenTime), query.StartTime);
+                }
+                if (!string.IsNullOrEmpty(query.EndTime))
+                {
+                    builder.AppendFormat(" AND A.{0}<='{1} 23:59:59' ", nameof(RB_Class_ViewModel.OpenTime), query.EndTime);
+                }
+                if (query.OldClassId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}<>{1} ", nameof(RB_Class_ViewModel.ClassId), query.OldClassId);
+                }
+                if (query.Teacher_Id > 0)
+                {
+                    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();
+        }
+        #endregion
     }
 }
\ No newline at end of file

Edu.Repository/Course/RB_Class_CheckRepository.cs

@@ -468,7 +468,7 @@ ORDER BY p.ClassDate ASC
         /// <param name="contractNo"></param>
         /// <param name="groupId"></param>
         /// <returns></returns>
-        public List<RB_Class_Check_ViewModel> GetStudentConsumptionHoursDetialPageList(int pageIndex, int pageSize, out long count, int teacherId, int schoolId, int classId, string startMonth, string endMonth, string studentName, int orderId, string contractNo, int groupId)
+        public List<RB_Class_Check_ViewModel> GetStudentConsumptionHoursDetialPageList(int pageIndex, int pageSize, out long count, int teacherId, int schoolId, int classId, string startMonth, string endMonth, string studentName, int orderId, string contractNo, int groupId,int StudentId)
         {
             string where = $@" ";
             if (teacherId > 0)
@@ -491,6 +491,10 @@ ORDER BY p.ClassDate ASC
             {
                 where += $@" and t2.OrderId ={orderId}";
             }
+            if (StudentId > 0)
+            {
+                where += $@" and t2.StudentId ={StudentId}";
+            }
             if (!string.IsNullOrEmpty(contractNo))
             {
                 where += $@" and ec.ContractNo ='{contractNo}'";

Edu.Repository/Course/RB_CourseRepository.cs

@@ -142,7 +142,7 @@ WHERE 1=1
                     }
                 }
             }
-            return GetPage<RB_Course_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+           return GetPage<RB_Course_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
         }
 
         /// <summary>

Edu.Repository/Course/RB_Course_ChapterRepository.cs

@@ -117,7 +117,7 @@ namespace Edu.Repository.Course
         /// <param name="courseId"></param>
         /// <param name="currentHours"></param>
         /// <returns></returns>
-        public RB_Course_Chapter_ViewModel GetMatchHoursChapterRepository(int courseId, double currentHours)
+        public List<RB_Course_Chapter_ViewModel> GetMatchHoursChapterRepository(int courseId, double currentHours)
         {
             var parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
@@ -128,9 +128,9 @@ namespace Edu.Repository.Course
             ");
             builder.AppendFormat(" AND {0}={1}", nameof(RB_Course_Chapter_ViewModel.Status), EnumHelper.ToInt(DateStateEnum.Normal));
             builder.AppendFormat(" AND {0}={1}", nameof(RB_Course_Chapter_ViewModel.CourseId), courseId);
-            builder.AppendFormat(" AND {0}<={1}", nameof(RB_Course_Chapter_ViewModel.CurrentHours), currentHours);
-            builder.AppendFormat(" ORDER BY {0} Desc",nameof(RB_Course_Chapter_ViewModel.CurrentHours));
-            return Get<RB_Course_Chapter_ViewModel>(builder.ToString(), parameters).ToList().FirstOrDefault();
+            builder.AppendFormat(" AND ({0}='{1}' or {2} like '{3}.%')", nameof(RB_Course_Chapter_ViewModel.ChapterNo), currentHours, nameof(RB_Course_Chapter_ViewModel.ChapterNo), currentHours);
+            //builder.AppendFormat(" ORDER BY {0} Desc",nameof(RB_Course_Chapter_ViewModel.CurrentHours));
+            return Get<RB_Course_Chapter_ViewModel>(builder.ToString(), parameters).ToList();
         }
     }
 }

Edu.Repository/Course/RB_OrderRepository.cs

@@ -229,6 +229,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)
             {
@@ -268,6 +272,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

@@ -65,14 +65,14 @@ namespace Edu.Repository.Course
 
             string sql = $@" 
 SELECT A.*,IFNULL(B.IsChaBan,0) AS IsChaBan,IFNULL(B.StartClassHours,0) AS StartClassHours,IFNULL(C.CourseName,'') AS CourseName
-       ,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId
+       ,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_course AS C ON (B.CourseId=C.CourseId AND B.CourseId>0 AND B.OrderType=1)
 WHERE {where}";
             return Get<RB_Order_Guest_ViewModel>(sql).ToList();
         }
 
- 
+
 
         /// <summary>
         /// 获取分页列表
@@ -237,5 +237,68 @@ FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
 WHERE {where}";
             return Get<RB_Order_Guest_ViewModel>(sql).ToList();
         }
+
+
+        /// <summary>
+        /// 获取分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="demodel"></param>
+        /// <param name="orderIds"></param>
+        /// <returns></returns>
+        public List<RB_Order_Guest_ViewModel> GetTeacherStudentPage(int pageIndex, int pageSize, out long rowsCount, RB_Order_Guest_ViewModel demodel)
+        {
+            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.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)
+LEFT JOIN (SELECT ClassId,COUNT(*) TotalPlanNum from rb_class_plan where `Status`=0 GROUP BY ClassId) as plan on plan.ClassId=class.ClassId
+LEFT JOIN (SELECT ClassId,COUNT(*) Ranks from rb_class_plan where `Status`=0 and DATE_FORMAT(ClassDate,'%Y-%m-%d') <=DATE_FORMAT(NOW(),'%Y-%m-%d') GROUP BY ClassId) as planr on planr.ClassId=class.ClassId
+WHERE  1=1 and A.Status=0    and b.OrderState<>3 
+");
+            if (demodel.Group_Id > 0)
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.Group_Id)} ={demodel.Group_Id}");
+            }
+            if (demodel.School_Id > 0)
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.School_Id)} ={demodel.School_Id}");
+            }
+            if (demodel.OrderId > 0)
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.OrderId)} ={demodel.OrderId}");
+            }
+            if (!string.IsNullOrEmpty(demodel.GuestName))
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.GuestName)} like '%{demodel.GuestName}%'");
+            }
+            if (demodel.ClassId > 0)
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.ClassId)} ={demodel.ClassId}");
+            }
+            if (demodel.CourseId > 0)
+            {
+                builder.AppendFormat($@" AND B.{nameof(RB_Order_Guest_ViewModel.CourseId)} ={demodel.CourseId}");
+            }
+            if (demodel.EnterID > 0)
+            {
+                builder.AppendFormat($@" AND B.{nameof(RB_Order_Guest_ViewModel.EnterID)} ={demodel.EnterID}");
+            }
+            if (demodel.SourceId > 0)
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.SourceId)} ={demodel.SourceId}");
+            }
+            
+            if (demodel.GuestState > 0)
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}");
+            }
+            return GetPage<RB_Order_Guest_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
+        }
     }
 }

Edu.Repository/Course/RB_Student_MakeupRepository.cs

@@ -96,7 +96,7 @@ WHERE 1=1
                 OrderGuestId = model.OrderGuestId
             };
             newModel.Id = CheckStudentMakeUpExistsRepository(model);
-            if (newModel.Id > 0)
+            if (newModel.Id <= 0)
             {
                 flag = base.Insert(newModel) > 0;
             }

Edu.Repository/EduTask/RB_Change_ClassPlanRepository.cs

+using Edu.Model.Entity.EduTask;
+using Edu.Model.ViewModel.EduTask;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Linq;
+
+namespace Edu.Repository.EduTask
+{
+    /// <summary>
+    /// 上课计划调整仓储层
+    /// </summary>
+    public class RB_Change_ClassPlanRepository : BaseRepository<RB_Change_ClassPlan>
+    {
+        /// <summary>
+        /// 获取调课计划列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Change_ClassPlan_ViewModel> GetChangeClassPlanListRepository(RB_Change_ClassPlan_ViewModel query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@" 
+SELECT A.*
+FROM RB_Change_ClassPlan AS A
+WHERE 1=1
+");
+            if (query != null)
+            { 
+               
+            }
+            return Get<RB_Change_ClassPlan_ViewModel>(builder.ToString()).ToList();
+        }
+    }
+}

Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs

+using Edu.Model.Entity.EduTask;
+using Edu.Model.ViewModel.EduTask;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Linq;
+using VT.FW.DB.Dapper;
+
+namespace Edu.Repository.EduTask
+{
+    /// <summary>
+    /// 教务单据仓储层
+    /// </summary>
+    public class RB_Education_ReceiptRepository : BaseRepository<RB_Education_Receipt>
+    {
+        /// <summary>
+        /// 获取教务单据分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Education_Receipt_ViewModel> GetEducationReceiptPageRepository(int pageIndex, int pageSize, out long rowsCount, EducationReceiptQuery query)
+        {
+            var parameters = new DynamicParameters();
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*
+FROM RB_Education_Receipt
+WHERE 1=1 
+");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Education_Receipt_ViewModel.Group_Id), query.Group_Id);
+                }
+                if (!string.IsNullOrEmpty(query.Title))
+                {
+                    builder.AppendFormat(@" AND A.{0} LIKE @Title ", nameof(RB_Education_Receipt_ViewModel.Title));
+                    parameters.Add("Title", "%" + query.Title.Trim() + "%");
+                }
+            }
+            return GetPage<RB_Education_Receipt_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
+        }
+    }
+}

Edu.Repository/Reserve/RB_Reserve_ClassRepository.cs

@@ -98,6 +98,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Reserve_Class_Extend.ClassRoomId), query.ClassRoomId);
                 }
+                if (query.School_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Reserve_Class_Extend.School_Id), query.School_Id);
+                }
             }
             return Get<RB_Reserve_Class_Extend>(builder.ToString(),parameters).ToList();
         }

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.Repository/User/RB_NoticeRepository.cs

@@ -160,7 +160,7 @@ namespace Edu.Repository.User
                 where += $@" and n.{nameof(RB_Notice.UpdateBy)} ={demodel.UpdateBy}";
             }
             if (!string.IsNullOrEmpty(demodel.To)) {
-                where += $@" and (FIND_IN_SET(d.DeptId,'{demodel.To}') or d.DeptId =-1)";
+                where += $@" and (FIND_IN_SET(d.DeptId,'{demodel.To}') or n.To =-1)";
             }
             if (!string.IsNullOrEmpty(demodel.LookTime))
             {

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -126,30 +126,46 @@ namespace Edu.WebApi.Controllers.Course
             {
                 CouseId = base.ParmJObj.GetInt("CourseId"),
                 IsQuerySurplus = base.ParmJObj.GetInt("IsQuerySurplus"),
+                Teacher_Id=base.ParmJObj.GetInt("Teacher_Id"),
+                IsQuerySurplusPlan=base.ParmJObj.GetInt("IsQuerySurplusPlan"),
             };
             query.Group_Id = base.UserInfo.Group_Id;
             query.School_Id = base.UserInfo.School_Id;
             var list = classModule.GetClassListModule(query);
-            if (list == null)
-            {
-                list = new List<RB_Class_ViewModel>();
-            }
-            if (IsAddDefault == 1)
+
+            List<object> result = new List<object>();
+            foreach (var item in list)
             {
-                list.Insert(0, new RB_Class_ViewModel()
+                List<object> planList = new List<object>();
+                if (item.ClassPlanList != null && item.ClassPlanList.Count > 0)
                 {
-                    ClassId = 0,
-                    ClassName = "请选择"
-                });
+                    foreach (var subItem in item.ClassPlanList)
+                    {
+                        var subObj = new
+                        {
+                            subItem.ClassPlanId,
+                            ClassDate = Common.ConvertHelper.FormatDate(subItem.ClassDate),
+                            subItem.ClassRoomId,
+                            subItem.RoomName,
+                            subItem.TeacherId,
+                            subItem.TeacherName,
+                            TimeList = subItem?.PlanTimeList?.Select(qitem => new { qitem.StartTime, qitem.EndTime, qitem.TimeHour })
+                        };
+                        planList.Add(subObj);
+                    }
+                }
+                var obj = new
+                {
+                    item.ClassId,
+                    item.ClassName,
+                    item.CouseId,
+                    item.CourseName,
+                    OpenTime = Common.ConvertHelper.FormatDate(item.OpenTime),
+                    PlanList = planList
+                };
+                result.Add(obj);
             }
-            return ApiResult.Success(data: list.Select(qitem => new
-            {
-                qitem.ClassId,
-                qitem.ClassName,
-                qitem.ClassHours,
-                qitem.CourseName,
-                OpenTime = Common.ConvertHelper.FormatDate(qitem.OpenTime)
-            }));
+            return ApiResult.Success(data: result);
         }
 
         /// <summary>
@@ -1381,7 +1397,7 @@ namespace Edu.WebApi.Controllers.Course
 
             #region 追加章节信息
 
-            var hours = classModule.GetCurrentPlanStudyHoursRepository(model.ClassPlanId);
+            var hours = classModule.GetCurrentPlanStudyHoursRepository(model.ClassPlanId)+1;
             if (hours != -1)
             {
                 var classObj = classModule.GetClassModule(model.ClassId);
@@ -1389,11 +1405,11 @@ namespace Edu.WebApi.Controllers.Course
                 var courseOjb = new CourseModule().GetCourseModule(classObj.CouseId);
 
                 var chapter = new CourseModule().GetMatchHoursChapterModule(classObj.CouseId, hours);
-                if (chapter != null && chapter.ChapterId > 0)
+                if (chapter != null && chapter.Count > 0)
                 {
-                    chapter.CourseName = courseOjb.CourseName;
                     model.Chapter = chapter;
                 }
+                model.CourseName = courseOjb.CourseName;
             }
 
             #endregion
@@ -2149,6 +2165,7 @@ namespace Edu.WebApi.Controllers.Course
                 TeacherId = base.ParmJObj.GetInt("TeacherId"),
                 ClassRoomId = base.ParmJObj.GetInt("ClassRoomId"),
                 Group_Id = base.UserInfo.Group_Id,
+                School_Id = -1,
                 ClassId = base.ParmJObj.GetInt("ClassId"),
             };
             //课程类型(0-全部,1-正常,2-试听课)

Edu.WebApi/Controllers/Course/ClassRoomController.cs

@@ -255,7 +255,7 @@ namespace Edu.WebApi.Controllers.Course
             }
             else
             {
-                
+
             }
             RB_Class_Plan_ViewModel query = new RB_Class_Plan_ViewModel()
             {
@@ -264,6 +264,7 @@ namespace Edu.WebApi.Controllers.Course
                 TeacherId = base.ParmJObj.GetInt("TeacherId"),
                 ClassRoomId = base.ParmJObj.GetInt("ClassRoomId"),
                 Group_Id = base.UserInfo.Group_Id,
+                School_Id = base.ParmJObj.GetInt("SchoolId", -1),
                 ClassId = base.ParmJObj.GetInt("ClassId"),
             };
             //课程类型(0-全部,1-正常,2-试听课)

Edu.WebApi/Controllers/Course/CourseController.cs

@@ -189,7 +189,7 @@ namespace Edu.WebApi.Controllers.Course
                 IsQTeacher = base.ParmJObj.GetInt("IsQTeacher"),
             };
             query.Group_Id = base.UserInfo.Group_Id;
-            query.School_Id = base.UserInfo.School_Id;
+            //query.School_Id = base.UserInfo.School_Id;
             var list = courseModule.GetCoursePageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             foreach (var item in list)
             {

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -231,6 +231,7 @@ namespace Edu.WebApi.Controllers.Course
                         EffectTime = Common.ConvertHelper.FormatDate(x.EffectTime),
                         x.UpOrderId,
                         x.VisitorReserveId,
+                        x.RenewOrderId,
                         SaleRemarkList = x.SaleRemarkList.Select(z => new
                         {
                             z.Id,
@@ -502,11 +503,11 @@ namespace Edu.WebApi.Controllers.Course
                         return ApiResult.ParamIsNull(message: "请选择插班课程!");
                     }
                 }
-                flag = orderModule.SetClassOrder(demodel, userInfo, base.CheckUserActionAuth("Edit_Order"), out message);
+                flag = orderModule.SetClassOrderModule(demodel, userInfo, base.CheckUserActionAuth("Edit_Order"), out message);
             }
             else
             {
-                flag = orderModule.SetStudyOrder(demodel, userInfo, out message);
+                flag = orderModule.SetStudyOrderModule(demodel, userInfo, out message);
             }
             return flag ? ApiResult.Success(message: message) : ApiResult.Failed(message: message);
         }
@@ -1229,6 +1230,7 @@ namespace Edu.WebApi.Controllers.Course
                     x.UpOrderId,
                     OpenTime = Common.ConvertHelper.FormatDate(x.OpenTime),
                     x.VisitorReserveId,
+                    x.RenewOrderId,
                     SaleRemarkList = x?.SaleRemarkList.Select(z => new
                     {
                         z.Id,
@@ -1306,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;
 
@@ -1380,6 +1383,7 @@ namespace Edu.WebApi.Controllers.Course
                     EffectTime = Common.ConvertHelper.FormatDate(x.EffectTime),
                     x.UpOrderId,
                     x.VisitorReserveId,
+                    x.RenewOrderId,
                     SaleRemarkList = x?.SaleRemarkList.Select(z => new
                     {
                         z.Id,

Edu.WebApi/Controllers/Course/StuController.cs

@@ -27,6 +27,8 @@ namespace Edu.WebApi.Controllers.Course
         /// </summary>
         private readonly StudentBillModule studentBillModule = AOP.AOPHelper.CreateAOPObject<StudentBillModule>();
 
+        private readonly OrderModule orderModule= AOP.AOPHelper.CreateAOPObject<OrderModule>();
+
         /// <summary>
         /// 获取学员退课单据分页列表
         /// </summary>
@@ -179,23 +181,48 @@ namespace Edu.WebApi.Controllers.Course
             int OrderId = base.ParmJObj.GetInt("OrderId");
             //学员编号
             int guestId = base.ParmJObj.GetInt("GuestId");
+            var oldOrderModel = orderModule.GetClassOrderInfoModule(OrderId);
             var orderModel = new RB_Order_ViewModel()
             {
+                OrderId=0,
+                ClassId = base.ParmJObj.GetInt("ClassId"),//班级编号
+                GuestNum = 1,
+                OrderSource= oldOrderModel.OrderSource,
+                OrderType=oldOrderModel.OrderType,
                 Class_Price = base.ParmJObj.GetDecimal("Class_Price"),//单价
                 Unit_Price = base.ParmJObj.GetDecimal("Class_Price"),//成交单价
-                GuestNum = 1,
                 PreferPrice = base.ParmJObj.GetDecimal("PreferPrice"),//应收，
                 Income = 0,
-                ClassId = base.ParmJObj.GetInt("ClassId"),//班级编号
+                HelpEnterId=0,
+                GeneralOccupation="",
+                EduOccupation="",
                 SaleRemark =base.ParmJObj.GetStringValue("SaleRemark"),//销售备注
-                CreateBy=base.UserInfo.Id,
-                CreateTime=DateTime.Now,
-                UpdateBy=base.UserInfo.Id,
-                UpdateTime=DateTime.Now,
-                Dept_Id=base.UserInfo.DeptId,
-                Group_Id=base.UserInfo.Group_Id,
+                SourceId=0,
+                IsLessPrice=0,
+                LessPrice=0,
+                OrderNature=oldOrderModel.OrderNature,
+                OldPreferPrice = base.ParmJObj.GetDecimal("PreferPrice"),//应收，
+                CourseId=0,
+                StartClassHours=0,
+                IsChaBan=0,
+                UpOrderId=0,
+                VisitorReserveId=0,
+                IsRenewOrder=1,
             };
-            bool flag = studentBillModule.RenewOrderModule(OrderId, guestId, orderModel,out string message);
+            orderModel.RenewOrderId = OrderId;
+            orderModel.Group_Id = base.UserInfo.Group_Id;
+            orderModel.School_Id = base.UserInfo.School_Id;
+            orderModel.Dept_Id = base.UserInfo.DeptId;
+            orderModel.OrderForm = OrderFormEnum.Computer;
+            orderModel.EnterID = base.UserInfo.Id;
+            orderModel.OrderState = OrderStateEnum.Normal;
+            orderModel.TradeWay = TradeWayEnum.OnLine;
+            orderModel.CreateBy = base.UserInfo.Id;
+            orderModel.CreateTime = DateTime.Now;
+            orderModel.UpdateBy = base.UserInfo.Id;
+            orderModel.UpdateTime = DateTime.Now;
+            orderModel.OldGuestId = guestId;
+            bool flag = orderModule.SetClassOrderModule(orderModel, base.UserInfo, base.CheckUserActionAuth("Edit_Order"), out string message);
             return flag ? ApiResult.Success() : ApiResult.Failed(message: message);
         }
 

Edu.WebApi/Controllers/User/LoginController.cs

@@ -238,9 +238,10 @@ namespace Edu.WebApi.Controllers.User
                 UserInfo userInfo = UserReidsCache.GetUserLoginInfo(Uid);
                 if (userInfo != null)
                 {
+                    //默认取管理端
                     var treeList = menuModule.GetPostMenuTreeModule(new Model.ViewModel.System.RB_Menu_ViewModel()
                     {
-                        MenuType = (int)userInfo.AccountType
+                        MenuType = 1
                     }, out List<RB_Menu_ViewModel> userCenterList, userInfo.PostId.ToString());
                     userInfo.MenuList = treeList;
                     userInfo.UserCenterList = userCenterList;

Edu.WebApi/Controllers/User/UserInfoController.cs

@@ -261,8 +261,8 @@ namespace Edu.WebApi.Controllers.User
                 CommissionId = commissionId,
                 SureStatus = sureStatus,
                 TotalTCommiommission = totalTCommiommission,
-                CommissionTId = sureTStatus,
-                SureTStatus = commissionTId,
+                CommissionTId = commissionTId,
+                SureTStatus = sureTStatus,
             });
         }
 

education.sln

@@ -62,7 +62,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.Module.Web", "Edu.Modul
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.Module.Duty", "Edu.Module.Duty\Edu.Module.Duty.csproj", "{3C354B2B-8706-49A6-A12A-5A64F28E7CDC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Edu.Module.Advertising", "Edu.Module.Advertising\Edu.Module.Advertising.csproj", "{43408243-8E36-4F9E-84C0-998CE383EC53}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.Module.Advertising", "Edu.Module.Advertising\Edu.Module.Advertising.csproj", "{43408243-8E36-4F9E-84C0-998CE383EC53}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Edu.Module.EduTask", "Edu.Module.EduTask\Edu.Module.EduTask.csproj", "{FEDB8D19-2C7E-4393-8D91-332256EC89CC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -154,6 +156,10 @@ Global
 		{43408243-8E36-4F9E-84C0-998CE383EC53}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{43408243-8E36-4F9E-84C0-998CE383EC53}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{43408243-8E36-4F9E-84C0-998CE383EC53}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FEDB8D19-2C7E-4393-8D91-332256EC89CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FEDB8D19-2C7E-4393-8D91-332256EC89CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FEDB8D19-2C7E-4393-8D91-332256EC89CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FEDB8D19-2C7E-4393-8D91-332256EC89CC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -178,6 +184,7 @@ Global
 		{380ACD87-3D6C-474C-A0ED-A91BD8E26081} = {7AC0A4EC-3215-4FF2-96DC-DE8325ED6915}
 		{3C354B2B-8706-49A6-A12A-5A64F28E7CDC} = {7AC0A4EC-3215-4FF2-96DC-DE8325ED6915}
 		{43408243-8E36-4F9E-84C0-998CE383EC53} = {7AC0A4EC-3215-4FF2-96DC-DE8325ED6915}
+		{FEDB8D19-2C7E-4393-8D91-332256EC89CC} = {7AC0A4EC-3215-4FF2-96DC-DE8325ED6915}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {8763B446-FAB1-46BF-9743-F2628533241B}