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

# Conflicts:
#	Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs
#	Edu.WebApi/Controllers/Course/ClassController.cs

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_Class_Plan.cs

@@ -50,5 +50,16 @@ namespace Edu.Model.Entity.Course
         /// 教师编号
         /// </summary>
         public int TeacherId { get; set; }
+
+
+        /// <summary>
+        /// 0-未备课，1-已备课
+        /// </summary>
+        public int BeiKeStatus { get; set; }
+
+        /// <summary>
+        /// 0-未反馈，1-已反馈
+        /// </summary>
+        public int FanKuiStatus { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/Entity/Course/RB_Order.cs

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

Edu.Model/Entity/DataStatistics/RB_SimpleReport.cs

@@ -21,7 +21,7 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 年份
         /// </summary>        
-        public int? Year
+        public int Year
         {
             get;
             set;
@@ -37,7 +37,7 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 一月
         /// </summary>        
-        public decimal? January
+        public decimal January
         {
             get;
             set;
@@ -45,7 +45,7 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 二月
         /// </summary>        
-        public decimal? February
+        public decimal February
         {
             get;
             set;
@@ -53,7 +53,7 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 三月
         /// </summary>        
-        public decimal? March
+        public decimal March
         {
             get;
             set;
@@ -61,7 +61,7 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 第一季度
         /// </summary>        
-        public decimal? FirstQuarter
+        public decimal FirstQuarter
         {
             get;
             set;
@@ -69,7 +69,7 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 四月
         /// </summary>        
-        public decimal? April
+        public decimal April
         {
             get;
             set;
@@ -77,7 +77,7 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 五月
         /// </summary>        
-        public decimal? May
+        public decimal May
         {
             get;
             set;
@@ -85,7 +85,7 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 六月
         /// </summary>        
-        public decimal? June
+        public decimal June
         {
             get;
             set;
@@ -93,7 +93,7 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 第二季度
         /// </summary>        
-        public decimal? SecondQuarter
+        public decimal SecondQuarter
         {
             get;
             set;
@@ -101,7 +101,7 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 上半年报
         /// </summary>        
-        public decimal? HalfReport
+        public decimal HalfReport
         {
             get;
             set;
@@ -109,7 +109,7 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 七月
         /// </summary>        
-        public decimal? July
+        public decimal July
         {
             get;
             set;
@@ -117,7 +117,7 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 八月
         /// </summary>        
-        public decimal? August
+        public decimal August
         {
             get;
             set;
@@ -125,7 +125,7 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 九月
         /// </summary>        
-        public decimal? September
+        public decimal September
         {
             get;
             set;
@@ -133,7 +133,7 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 第三季度
         /// </summary>        
-        public decimal? ThirdQuarter
+        public decimal ThirdQuarter
         {
             get;
             set;
@@ -141,7 +141,7 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 十月
         /// </summary>        
-        public decimal? October
+        public decimal October
         {
             get;
             set;
@@ -149,7 +149,7 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 十一月
         /// </summary>        
-        public decimal? November
+        public decimal November
         {
             get;
             set;
@@ -157,7 +157,7 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 十二月
         /// </summary>        
-        public decimal? December
+        public decimal December
         {
             get;
             set;
@@ -165,7 +165,7 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 第四季度
         /// </summary>        
-        public decimal? FourthQuarter
+        public decimal FourthQuarter
         {
             get;
             set;
@@ -173,7 +173,7 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 下半年报
         /// </summary>        
-        public decimal? LastHalfReport
+        public decimal LastHalfReport
         {
             get;
             set;
@@ -181,7 +181,7 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 总计
         /// </summary>        
-        public decimal? Total
+        public decimal Total
         {
             get;
             set;
@@ -189,7 +189,7 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 集团ID
         /// </summary>        
-        public int? Rb_Group_Id
+        public int Rb_Group_Id
         {
             get;
             set;
@@ -197,16 +197,21 @@ namespace Edu.Model.Entity.Finance
         /// <summary>
         /// 所属公司
         /// </summary>
-        public int? BranchId
+        public int BranchId
         {
             get; set;
         }
         /// <summary>
         /// 排序
         /// </summary>
-        public int? Sort
+        public int Sort
         {
             get; set;
         }
+
+        /// <summary>
+        /// 费用类型
+        /// </summary>
+        public string CostTypeIds { 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-教室,4-取消课程)
+		/// </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/Finance/RB_Costtype.cs

@@ -105,12 +105,17 @@ namespace Edu.Model.Entity.Finance
             set;
         }
         /// <summary>
-        /// 是否进入营收报表
+        /// 是否进入营收报表   1是
         /// </summary>
         public int? Is_Report { get; set; }
         /// <summary>
         /// 是否是机密费用  1是 0否
         /// </summary>
         public int? IsSecret { get; set; }
+
+        /// <summary>
+        /// 费用类型  1费用（计算利润）   2往来   3其他
+        /// </summary>
+        public int ReportType { get; set; }
     }
 }

Edu.Model/Entity/StudyAbroad/RB_StudyAbroad.cs

@@ -137,10 +137,5 @@ namespace Edu.Model.Entity.StudyAbroad
 		/// </summary>
 		public string ImgCover { get; set; }
 
-        /// <summary>
-        /// 确认时间（确认后 才能发提成  才进报表）
-        /// </summary>
-        public DateTime? ConfirmDate { get; set; }
-
     }
 }

Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs

@@ -114,6 +114,11 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string OpenTimeStr { get; set; }
 
+        /// <summary>
+        /// 预计完成时间
+        /// </summary>
+        public string FinishTimeStr { get; set; }
+
         /// <summary>
         /// 开班开始时间
         /// </summary>
@@ -231,6 +236,10 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string MoreStatus { get; set; }
 
+        /// <summary>
+        /// 是否查询剩余的上课计划
+        /// </summary>
+        public int IsQuerySurplusPlan { get; set; }
     }
 
     /// <summary>

Edu.Model/ViewModel/Course/RB_Order_ViewModel.cs

@@ -117,6 +117,16 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string OPEndTime { get; set; }
 
+        /// <summary>
+        /// 确认开始时间
+        /// </summary>
+        public string ConfirmSTime { get; set; }
+
+        /// <summary>
+        /// 确认结束时间
+        /// </summary>
+        public string ConfirmETime { get; set; }
+
         /// <summary>
         /// 未收款
         /// </summary>

Edu.Model/ViewModel/DataStatistics/RB_SimpleReport_Extend.cs

@@ -30,5 +30,65 @@ namespace Edu.Model.ViewModel.Finance
         /// 跨年统计  起始月份
         /// </summary>
         public string StartMonth { get; set; }
+
+        /// <summary>
+        /// 是否更新  1是
+        /// </summary>
+        public int IsUpdate { get; set; }
+    }
+
+    /// <summary>
+    /// 报表分组
+    /// </summary>
+    public class ReportGroupModel { 
+        /// <summary>
+        /// 费用id
+        /// </summary>
+        public int CostTypeId { get; set; }
+
+        /// <summary>
+        /// 费用名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 类型  1费用（计算利润）   2往来   3其他
+        /// </summary>
+        public int ReportType { get; set; }
+
+        /// <summary>
+        /// 收支  1收  2支
+        /// </summary>
+        public int IncomeType { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int Sort { get; set; }
+
+        /// <summary>
+        /// 子集
+        /// </summary>
+        public List<ReportChildModel> ChildList { get; set; }
+    }
+
+    /// <summary>
+    /// 子集
+    /// </summary>
+    public class ReportChildModel {
+        /// <summary>
+        /// 费用id
+        /// </summary>
+        public int CostTypeId { get; set; }
+
+        /// <summary>
+        /// 费用名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int Sort { get; set; }
     }
 }

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.Model/ViewModel/Finance/RB_Finance_Extend.cs

@@ -70,6 +70,10 @@ namespace Edu.Model.ViewModel.Finance
         /// </summary>
         public string GuestIdStr { get; set; }
 
+        /// <summary>
+        /// 费用类型id
+        /// </summary>
+        public int CostTypeId { get; set; }
 
         /// <summary>
         /// 审核开始时间

Edu.Model/ViewModel/StudyAbroad/RB_StudyAbroad_ViewModel.cs

@@ -84,15 +84,5 @@ namespace Edu.Model.ViewModel.StudyAbroad
         /// 结束时间
         /// </summary>
         public string EndTime { get; set; }
-
-        /// <summary>
-        /// 确认开始时间
-        /// </summary>
-        public string ConfirmSTime { get; set; }
-
-        /// <summary>
-        /// 确认结束时间
-        /// </summary>
-        public string ConfirmETime { get; set; }
     }
 }

Edu.Module.Course/ClassModule.cs

@@ -150,7 +150,45 @@ namespace Edu.Module.Course
         /// <returns></returns>
         public List<RB_Class_ViewModel> GetClassListModule(RB_Class_ViewModel query)
         {
-            return classRepository.GetClassListRepository(query);
+            var list= classRepository.GetClassListRepository(query);
+            if (list != null && list.Count > 0)
+            {
+                string classIds = string.Join(",", list.Select(qitem => qitem.ClassId));
+                List<RB_Class_Plan_ViewModel> planList = new List<RB_Class_Plan_ViewModel>();
+                List<RB_Class_Time_ViewModel> timeList = new List<RB_Class_Time_ViewModel>();
+                //查询剩余的上课计划
+                if (query.IsQuerySurplusPlan == 1)
+                {
+                    planList = class_PlanRepository.GetClassPlanListRepository(new RB_Class_Plan_ViewModel()
+                    {
+                        QClassIds = classIds,
+                        StartTime = Common.ConvertHelper.FormatDate(DateTime.Now)
+                    });
+                }
+
+                if (planList != null && planList.Count > 0)
+                {
+                    string planIds = string.Join(",", planList.Select(qitem => qitem.ClassPlanId));
+                    timeList = class_TimeRepository.GetClassTimeListRepository(new RB_Class_Time_ViewModel()
+                    {
+                        QClassIds = classIds,
+                        QClassPlanIds = planIds,
+                    });
+                }
+                foreach (var item in list)
+                {
+                    var tempPlanList = planList?.Where(qitem => qitem.ClassId == item.ClassId)?.OrderBy(qitem => qitem.ClassDate)?.ToList();
+                    if (tempPlanList != null && tempPlanList.Count > 0)
+                    {
+                        foreach (var sItem in tempPlanList)
+                        {
+                            sItem.PlanTimeList=timeList?.Where(qitem => qitem.ClassId == item.ClassId && qitem.ClassPlanId == sItem.ClassPlanId)?.OrderBy(qitem => qitem.StartTime)?.ToList()??new List<RB_Class_Time_ViewModel> ();
+                        }
+                    }
+                    item.ClassPlanList = tempPlanList ?? new List<RB_Class_Plan_ViewModel>();
+                }
+            }
+            return list;
         }
 
         /// <summary>
@@ -225,12 +263,17 @@ namespace Edu.Module.Course
                 var classOrderList = new List<RB_Order_ViewModel>();
                 var stepPriceList = new List<RB_Class_StepPrice_ViewModel>();
                 var otherCourseList = new List<RB_Class_Course_Extend>();
+                var maxPlanDateList = new List<RB_Class_Plan_ViewModel>();
                 string ids = string.Join(",", list.Select(qitem => qitem.ClassId));
                 if (!string.IsNullOrEmpty(ids))
                 {
                     classTimeList = class_TimeRepository.GetClassTimeListRepository(ids);
                     classOrderList = orderRepository.GetClassOrderPeopleNumRepository(ids);
                     otherCourseList = GetClassCourseListModule(new RB_Class_Course_Extend() { QClassIds = ids });
+                    maxPlanDateList= class_PlanRepository.GetClassPlanMaxDataRepository(new RB_Class_Plan_ViewModel()
+                    {
+                        QClassIds = ids
+                    });
                 }
                 if (isGetStepPrice)
                 {
@@ -240,6 +283,8 @@ namespace Edu.Module.Course
                 //课程计划上课日期
                 foreach (var item in list)
                 {
+                    var finish = maxPlanDateList?.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault()?.ClassDate;
+                    item.FinishTimeStr = Common.ConvertHelper.FormatDate(finish);
                     item.NewPlanDateTime = classTimeList?.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault()?.NewPlanDateTime;
                     item.OrderStudentCount = classOrderList?.Where(qitem => qitem.ClassId == item.ClassId)?.FirstOrDefault()?.GuestNum ?? 0;
                     if (isGetStepPrice)
@@ -1705,6 +1750,19 @@ namespace Edu.Module.Course
             return list;
         }
 
+
+        /// <summary>
+        /// 获取上课计划
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Class_Plan_ViewModel> GetClassPlanList_V3(RB_Class_Plan_ViewModel query)
+        {
+            var list = class_PlanRepository.GetClassPlanList_V2(query);
+
+            return list;
+        }
+
         /// <summary>
         /// 获取学生列表
         /// </summary>
@@ -1821,8 +1879,16 @@ namespace Edu.Module.Course
                     {
                         LessonPlanId = ClassLessonPlanRepository.Insert(item);
                         flag = LessonPlanId > 0;
-                    }
                        
+                    }
+                    if (flag)
+                    {
+                        Dictionary<string, object> fileds = new Dictionary<string, object>()
+                            {
+                                {nameof(RB_Class_Plan_ViewModel.BeiKeStatus),1},
+                            };
+                        class_PlanRepository.Update(fileds, new WhereHelper(nameof(RB_Class_Plan_ViewModel.ClassPlanId), item.ClassPlanId));
+                    }
                     foreach (var itemDetails in item.LessonPlanDetailsList)
                     {
                         itemDetails.LessonPlanId = LessonPlanId;
@@ -1909,6 +1975,14 @@ namespace Edu.Module.Course
                         flag = ClassLessonPlanRepository.Update(fileds, new WhereHelper(nameof(RB_Class_LessonPlan_ViewModel.LessonPlanId), item.LessonPlanId));
                     }
                 }
+                if (flag)
+                {
+                    Dictionary<string, object> fileds = new Dictionary<string, object>()
+                            {
+                                {nameof(RB_Class_Plan_ViewModel.FanKuiStatus),1},
+                            };
+                    class_PlanRepository.Update(fileds, new WhereHelper(nameof(RB_Class_Plan_ViewModel.ClassPlanId), model.LessonPlanList.FirstOrDefault().ClassPlanId));
+                }
             }
             return flag;
         }
@@ -2945,11 +3019,12 @@ namespace Edu.Module.Course
                         item.RoomName,
                         item.TeacherName,
                         item.TotalPlanNum,
+                        ClassDate = item.ClassDate.ToString("yyyy-MM-dd"),
                         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 }),
+                        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 }),
 
                     });
                 }

Edu.Module.Course/TeachingRewardsModule.cs

@@ -558,7 +558,7 @@ namespace Edu.Module.Course
                 decimal TotalMoney = 0;
                 foreach (var item in plist)
                 {
-                    var dateqList = DateList.Where(x => x.TeacherId == item.TeacherId && x.Date == item.ClassDate).ToList();
+                    var dateqList = DateList.Where(x => x.TeacherId == item.TeacherId && x.ClassId == item.ClassId && x.Date == item.ClassDate).ToList();
                     //查询课时
                     decimal ksNum = dateqList.Sum(x => x.KSNum); 
                     //查询课单价

Edu.Module.EduTask/ChangeClassPlanModule.cs

+using Edu.Model.Entity.EduTask;
+using Edu.Model.ViewModel.EduTask;
+using Edu.Repository.EduTask;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.AOP.CustomerAttribute;
+using VT.FW.DB;
+
+namespace Edu.Module.EduTask
+{
+    /// <summary>
+    /// 调课计划处理类
+    /// </summary>
+    public class ChangeClassPlanModule
+    {
+        /// <summary>
+        /// 教务单据仓储层对象
+        /// </summary>
+        private readonly RB_Education_ReceiptRepository education_ReceiptRepository = new RB_Education_ReceiptRepository();
+
+        /// <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>
+        [TransactionCallHandler]
+        public virtual 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;
+                if (flag)
+                {
+                    var educationReceipt = new RB_Education_Receipt()
+                    {
+                         Id=0,
+                         Title="调课申请",
+                         ReceiptType= Common.Enum.Finance.ReceiptTypeEnum.ChangeClass,
+                         RelationId=newId,
+                         Group_Id=extModel.Group_Id,
+                         School_Id=extModel.School_Id,
+                         CreateBy=extModel.CreateBy,
+                         CreateTime=extModel.CreateTime,
+                         UpdateBy=extModel.UpdateBy,
+                         UpdateTime=extModel.UpdateTime,
+                         VerifyStatus= Common.Enum.Finance.WFRrocessStatus.NotAudit
+                    };
+                    flag= education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt);
+                }
+            }
+            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.StudyAbroad/StudyAbroadModule.cs

@@ -233,7 +233,8 @@ namespace Edu.Module.StudyAbroad
         {
             var model = studyAbroadRepository.GetStudyAbroadListExtRepository(new RB_StudyAbroad_ViewModel()
             {
-                Id = Id
+                Id = Id,
+                School_Id = -1
             })?.FirstOrDefault();
             if (model != null && IsGetPrice == 1)
             {

Edu.Module.System/HolidayModule.cs

@@ -41,6 +41,28 @@ namespace Edu.Module.System
             return holidayRepository.GetDayhList(NowDay);
         }
 
+
+        /// <summary>
+        /// 判断某一个时间段是否在节假日里
+        /// </summary>
+        /// <param name="NowDay"></param>
+        /// <returns></returns>
+        public List<RB_System_Holiday> GetExistHoliday(string startTime, string endTime)
+        {
+            return holidayRepository.GetExistHoliday(startTime, endTime);
+        }
+
+        /// <summary>
+        /// 获取节假日详情
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public RB_System_Holiday GetEntity(object id)
+        {
+
+            return holidayRepository.GetEntity(id);
+        }
+
         /// <summary>
         /// 新增/修改节假日
         /// </summary>

Edu.Repository/Course/RB_ClassRepository.cs

@@ -65,6 +65,10 @@ WHERE 1=1
                 {
                     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();
         }

Edu.Repository/Course/RB_Class_CheckRepository.cs

@@ -493,7 +493,7 @@ ORDER BY p.ClassDate ASC
             }
             if (StudentId > 0)
             {
-                where += $@" and t2.StudentId ={StudentId}";
+                where += $@" and t2.Id ={StudentId}";
             }
             if (!string.IsNullOrEmpty(contractNo))
             {
@@ -670,12 +670,15 @@ GROUP BY tt.ClassId,tt.OrderGuestId
         /// <param name="classNo"></param>
         /// <param name="group_Id"></param>
         /// <returns></returns>
-        public List<RB_Class_Check_ViewModel> GetAllClassNowMonthStatistics(string startTime, string endTime, int classId, string classNo, int group_Id)
+        public List<RB_Class_Check_ViewModel> GetAllClassNowMonthStatistics(string startTime, string endTime, int classId, string classNo, int schoolId, int group_Id)
         {
             string where = "";
             if (classId > 0) {
                 where += " and cc.ClassId =" + classId;
             }
+            if (schoolId >= 0) {
+                where += " and c.School_Id =" + schoolId;
+            }
             if (!string.IsNullOrEmpty(classNo)) {
                 where += " and c.ClassNo ='" + classNo + "'";
             }

Edu.Repository/Course/RB_Class_PlanRepository.cs

@@ -289,6 +289,37 @@ where  a.`Status`=0 and c.ClassStatus=2  and c.`Status`=0");
             return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList();
         }
 
+        /// <summary>
+        /// 获取班级最后一次上课日期
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Class_Plan_ViewModel> GetClassPlanMaxDataRepository(RB_Class_Plan_ViewModel query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@" 
+SELECT A.ClassId,MAX(A.ClassDate) AS ClassDate 
+FROM rb_class_plan AS A
+WHERE 1=1 ");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Group_Id), query.Group_Id);
+                }
+    
+                if (query.ClassId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.ClassId), query.ClassId);
+                }
+                if (!string.IsNullOrEmpty(query.QClassIds))
+                {
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Class_Plan_ViewModel.ClassId), query.QClassIds);
+                }
+            }
+            return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList();
+        }
+
 
 
         /// <summary>
@@ -370,16 +401,18 @@ WHERE p.`Status`=0 AND p.Group_Id={group_Id} AND p.ClassId ={classId}
         public List<RB_Class_Plan_ViewModel> GetTeacherPlanListRepository(RB_Class_Plan_ViewModel query)
         {
             StringBuilder builder = new StringBuilder();
-            //builder.AppendFormat(@"
-            //            SELECT A.*,class.ClassName,lp.LessonPlanNum,lps.LessonPlanSummaryNum,IFNULL(B.RoomName,'') AS RoomName,IFNULL(T.TeacherName,'') AS TeacherName,IFNULL(T.TeacherHead,'') AS UserIcon
-            //            FROM RB_Class_Plan AS A LEFT JOIN rb_class_room AS B ON A.ClassRoomId=B.RoomId
-            //            LEFT JOIN rb_class as class on a.ClassId=class.ClassId
-            //                 LEFT JOIN rb_teacher AS T ON A.TeacherId=T.TId
-            //            LEFT JOIN (SELECT ClassPlanId,COUNT(*) as LessonPlanNum from rb_class_lessonplan where `Status`=0  GROUP BY ClassPlanId)as lp on a.ClassPlanId=lp.ClassPlanId
-            //LEFT JOIN (SELECT ClassPlanId,COUNT(*) as LessonPlanSummaryNum from rb_class_lessonplan where `Status`=0  and  ISNULL(Summary)=0 and LENGTH(trim(Summary))>0  GROUP BY ClassPlanId)as lps on a.ClassPlanId=lps.ClassPlanId                      
-            //WHERE 1=1 and class.ClassStatus=2 and  t.`Status`=0
-            //            ");
-            // builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)DateStateEnum.Normal);
+            builder.AppendFormat(@"
+                       SELECT * from (SELECT 
+(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,
+A.*,class.ClassName,lp.LessonPlanNum,lps.LessonPlanSummaryNum,IFNULL(B.RoomName,'') AS RoomName,IFNULL(T.TeacherName,'') AS TeacherName,IFNULL(T.TeacherHead,'') AS UserIcon
+FROM RB_Class_Plan AS A LEFT JOIN rb_class_room AS B ON A.ClassRoomId=B.RoomId
+LEFT JOIN rb_class as class on a.ClassId=class.ClassId
+     LEFT JOIN rb_teacher AS T ON A.TeacherId=T.TId
+LEFT JOIN (SELECT ClassPlanId,COUNT(*) as LessonPlanNum from rb_class_lessonplan where `Status`=0  GROUP BY ClassPlanId)as lp on a.ClassPlanId=lp.ClassPlanId
+ LEFT JOIN (SELECT ClassPlanId,COUNT(*) as LessonPlanSummaryNum from rb_class_lessonplan where `Status`=0  and  ISNULL(Summary)=0 and LENGTH(trim(Summary))>0  GROUP BY ClassPlanId)as lps on a.ClassPlanId=lps.ClassPlanId
+WHERE 1=1 and class.ClassStatus=2 and  t.`Status`=0 and  a.`Status`=0 ORDER BY a.ClassId,a.ClassDate) as a where 1=1 
+                        ");
+            builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)DateStateEnum.Normal);
             if (query != null)
             {
                 if (query.ClassId > 0)
@@ -408,19 +441,19 @@ WHERE p.`Status`=0 AND p.Group_Id={group_Id} AND p.ClassId ={classId}
                 }
                 if (!string.IsNullOrEmpty(query.QMonth))
                 {
-                    builder.AppendFormat(" AND DATE_FORMAT(A.{0},''%y/%m'')= DATE_FORMAT(''{1}-01'',''%y/%m'') ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.QMonth);
+                    builder.AppendFormat(" AND DATE_FORMAT(A.{0},'%y/%m')= DATE_FORMAT('{1}-01','%y/%m') ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.QMonth);
                 }
                 if (!string.IsNullOrEmpty(query.StartTime))
                 {
-                    builder.AppendFormat(" AND DATE_FORMAT(A.{0},''%y-%m-%d'')>=DATE_FORMAT(''{1}'',''%y-%m-%d'') ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.StartTime);
+                    builder.AppendFormat(" AND DATE_FORMAT(A.{0},'%y-%m-%d')>=DATE_FORMAT('{1}','%y-%m-%d') ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.StartTime);
                 }
                 if (!string.IsNullOrEmpty(query.EndTime))
                 {
-                    builder.AppendFormat(" AND DATE_FORMAT(A.{0},''%y-%m-%d'')<=DATE_FORMAT(''{1}'',''%y-%m-%d'') ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.EndTime);
+                    builder.AppendFormat(" AND DATE_FORMAT(A.{0},'%y-%m-%d')<=DATE_FORMAT('{1}','%y-%m-%d') ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.EndTime);
                 }
             }
 
-            //   return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList();
+               return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList();
 
             ////            string sql = $@"
             ////SELECT * from (SELECT IF
@@ -442,8 +475,8 @@ WHERE p.`Status`=0 AND p.Group_Id={group_Id} AND p.ClassId ={classId}
             ////( SELECT @rank := 0, @class := 0, @score := '2020-01-01', @colum := 0 ) r
             ////WHERE 1=1 and class.ClassStatus=2 and  t.`Status`=0 and  a.`Status`=0 ORDER BY a.ClassId,a.ClassDate) as a where 1=1 {builder.ToString()} ";
 
-            string sql = $@"CALL proc_GetClassPlanRank('{builder.ToString()}')";
-            return Get<RB_Class_Plan_ViewModel>(sql).ToList();
+           // string sql = $@"CALL proc_GetClassPlanRank('{builder.ToString()}')";
+           // return Get<RB_Class_Plan_ViewModel>(sql).ToList();
         }
 
 

Edu.Repository/Course/RB_OrderRepository.cs

@@ -90,6 +90,14 @@ namespace Edu.Repository.Course
                     where += $@" and o.{nameof(RB_Order_ViewModel.OrderState)} =3";
                 }
             }
+            if (!string.IsNullOrEmpty(demodel.ConfirmSTime))
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.LXConfirmDate)} >='{demodel.ConfirmSTime}'";
+            }
+            if (!string.IsNullOrEmpty(demodel.ConfirmETime))
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.LXConfirmDate)} <='{demodel.ConfirmETime} 23:59:59'";
+            }
             if (demodel.IsChaBan ==1 )
             {
                 where += $@" and o.{nameof(RB_Order_ViewModel.IsChaBan)} ={demodel.IsChaBan}";
@@ -818,5 +826,121 @@ where {where} order by {orderBy}
         }
 
         #endregion
+
+        #region 简易报表
+
+        /// <summary>
+        /// 获取列表留学
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Order_ViewModel> GetListForReport(RB_Order_ViewModel demodel)
+        {
+            string where = $@" 1=1 ";
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.School_Id >= 0)
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.School_Id)} ={demodel.School_Id}";
+            }
+            if (demodel.OrderId > 0)
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.OrderId)} ={demodel.OrderId}";
+            }
+            if (demodel.OrderType > 0)
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.OrderType)} ={(int)demodel.OrderType}";
+            }
+            if (demodel.ClassId > 0)
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.ClassId)} ={demodel.ClassId}";
+            }
+            if (demodel.SourceId > 0)
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.SourceId)} ={demodel.SourceId}";
+            }
+            if (demodel.CourseId > 0)
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.CourseId)} ={demodel.CourseId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.ClassIds))
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.ClassId)} in({demodel.ClassIds})";
+            }
+            if (!string.IsNullOrEmpty(demodel.SourceIds))
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.SourceId)} in({demodel.SourceIds})";
+            }
+            if (demodel.OrderState > 0)
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.OrderState)} ={(int)demodel.OrderState}";
+            }
+            if (demodel.OrderSource > 0)
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.OrderSource)} ={(int)demodel.OrderSource}";
+            }
+            if (demodel.OrderForm > 0)
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.OrderForm)} ={(int)demodel.OrderForm}";
+            }
+            if (demodel.EnterID > 0)
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.EnterID)} ={demodel.EnterID}";
+            }
+            if (demodel.Dept_Id > 0)
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.Dept_Id)} ={demodel.Dept_Id}";
+            }
+            if (demodel.Q_OrderState > 0)
+            {
+                if (demodel.Q_OrderState == 1)
+                {
+                    where += $@" and o.{nameof(RB_Order_ViewModel.OrderState)} in(1,2)";
+                }
+                else if (demodel.Q_OrderState == 2)
+                {
+                    where += $@" and o.{nameof(RB_Order_ViewModel.OrderState)} =3";
+                }
+            }
+            if (!string.IsNullOrEmpty(demodel.ConfirmSTime))
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.LXConfirmDate)} >='{demodel.ConfirmSTime}'";
+            }
+            if (!string.IsNullOrEmpty(demodel.ConfirmETime))
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.LXConfirmDate)} <='{demodel.ConfirmETime} 23:59:59'";
+            }
+            if (demodel.IsChaBan == 1)
+            {
+                where += $@" and o.{nameof(RB_Order_ViewModel.IsChaBan)} ={demodel.IsChaBan}";
+            }
+            if (!string.IsNullOrEmpty(demodel.Q_EffectTime))
+            {
+                where += string.Format(" and DATE_FORMAT(o.EffectTime,'%y/%m/%d')=DATE_FORMAT('{0}','%y/%m/%d') ", demodel.Q_EffectTime);
+            }
+            string orderBy = " o.OrderId asc";
+            if (demodel.Q_OrderBy == 1)
+            {
+                orderBy = " o.OrderId asc";
+            }
+            else if (demodel.Q_OrderBy == 2)
+            {
+                orderBy = " o.CreateTime desc";
+            }
+
+            string sql = $@" 
+SELECT o.*,c.ClassName,t.TeacherName,t.TeacherIcon,IFNULL(course.CourseName,'') AS CourseName,c.OpenTime,IFNULL(course.ClassHours,0) AS ClassHours
+FROM RB_Order o 
+    LEFT JOIN rb_class c on o.ClassId = c.ClassId
+    LEFT JOIN rb_teacher t on c.Teacher_Id = t.TId
+    LEFT JOIN rb_course AS course ON (o.CourseId=course.CourseId AND o.CourseId>0 AND o.OrderType=1) 
+WHERE {where}
+ORDER BY {orderBy}
+";
+            return Get<RB_Order_ViewModel>(sql).ToList();
+        }
+        #endregion
     }
 }

Edu.Repository/DataStatistics/RB_SimpleReportRepository.cs

@@ -40,7 +40,7 @@ namespace Edu.Repository.Finance
             {
                 where += string.Format(" AND A." + nameof(RB_SimpleReport_Extend.BranchId) + " !=-1 ");
             }
-            string sql = string.Format(@"SELECT * FROM {0} AS A WHERE {1} ", nameof(RB_SimpleReport), where);
+            string sql = string.Format(@"SELECT * FROM {0} AS A WHERE {1} order by Sort asc", nameof(RB_SimpleReport), where);
             return Get<RB_SimpleReport_Extend>(sql).ToList();
         }
     }

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;
+using VT.FW.DB;
+
+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();
+        }
+
+
+        /// <summary>
+        /// 新增修改教务单据
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool SetEducationReceiptRepository(RB_Education_Receipt model)
+        {
+            bool flag = false;
+            if (model.Id > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Education_Receipt.UpdateBy),model.UpdateBy },
+                    {nameof(RB_Education_Receipt.UpdateTime),model.UpdateTime },
+                };
+                flag = base.Update(fileds, new WhereHelper(nameof(RB_Education_Receipt.Id),model.Id));
+            }
+            else
+            {
+                var newId = base.Insert(model);
+                model.Id = newId;
+                flag = newId > 0;
+            }
+            return flag;
+        }
+    }
+}

Edu.Repository/Finance/RB_FinanceRepository.cs

@@ -244,7 +244,7 @@ WHERE {1} {2} ", TableName, where, " ORDER BY A.FrID DESC");
                 where.Append(" AND b." + nameof(RB_Finance.FinanceType) + "=" + model.FinanceType + "");
             }
 
-            builder.AppendFormat(@"select distinct b.FrID,IFNULL(b.MatchMoney,0) as MatchMoney,IFNULL(E.TCID,0)TCID,D.Name,b.Status,b.TradeDate,b.CreateDate,b.RB_Branch_Id,a.ID,a.CostTypeId,IFNULL(b.Is_Cashier,0)Is_Cashier,a.Money,b.OrderID,b.OrderSource,b.SourceID,IFNULL(b.PayMoney,0)PayMoney,IFNULL(b.Fee,0)Fee,b.Type 
+            builder.AppendFormat(@"select distinct b.FrID,IFNULL(b.MatchMoney,0) as MatchMoney,IFNULL(E.TCID,0)TCID,D.Name,b.Status,b.TradeDate,b.CreateDate,b.RB_Branch_Id,a.ID,a.CostTypeId,IFNULL(b.Is_Cashier,0)Is_Cashier,a.Money,IFNULL(b.OrderID,0) OrderID,b.OrderSource,b.SourceID,IFNULL(b.PayMoney,0)PayMoney,IFNULL(b.Fee,0)Fee,b.Type 
 from rb_financedetail a INNER JOIN rb_finance as b on a.FinanceId=b.FrID and a.`Status`=0 
 INNER JOIN rb_costtype AS D ON D.ID=a.CostTypeId
 LEFT JOIN rb_tradeway as td ON b.FrID=td.FinanceId

Edu.Repository/StudyAbroad/RB_StudyAbroadRepository.cs

@@ -196,6 +196,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1}", nameof(RB_StudyAbroad_ViewModel.Group_Id), query.Group_Id);
                 }
+                if (query.School_Id >= 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1}", nameof(RB_StudyAbroad_ViewModel.School_Id), query.School_Id);
+                }
                 if (!string.IsNullOrEmpty(query.Name))
                 {
                     builder.AppendFormat(" AND A.{0} LIKE @Name ", nameof(RB_StudyAbroad_ViewModel.Name));
@@ -229,14 +233,6 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0} <='{1} 23:59:59'", nameof(RB_StudyAbroad_ViewModel.CreateTime), query.EndTime);
                 }
-                if (!string.IsNullOrEmpty(query.ConfirmSTime))
-                {
-                    builder.AppendFormat(" AND A.{0} >='{1}'", nameof(RB_StudyAbroad_ViewModel.ConfirmDate), query.ConfirmSTime);
-                }
-                if (!string.IsNullOrEmpty(query.ConfirmETime))
-                {
-                    builder.AppendFormat(" AND A.{0} <='{1} 23:59:59'", nameof(RB_StudyAbroad_ViewModel.ConfirmDate), query.ConfirmETime);
-                }
                 return Get<RB_StudyAbroad_ViewModel>(builder.ToString(), parameters).ToList();
             }
         }

Edu.Repository/System/RB_System_HolidayRepository.cs

@@ -6,7 +6,7 @@ using Edu.Model.Entity.System;
 
 namespace Edu.Repository.System
 {
-   public class RB_System_HolidayRepository:BaseRepository<RB_System_Holiday>
+    public class RB_System_HolidayRepository : BaseRepository<RB_System_Holiday>
     {
         /// <summary>
         /// 表名称
@@ -60,5 +60,26 @@ namespace Edu.Repository.System
             return Get<RB_System_Holiday>(sql).ToList();
         }
 
+
+
+
+        /// <summary>
+        /// 判断某一个时间段是否在节假日里
+        /// </summary>
+        /// <param name="NowDay"></param>
+        /// <returns></returns>
+        public List<RB_System_Holiday> GetExistHoliday(string startTime, string endTime)
+        {
+            string sql = $@"SELECT * FROM RB_System_Holiday WHERE `Status` = 0 and 
+(( DATE_FORMAT(StartTime, '%y/%m/%d') <= DATE_FORMAT('{startTime}', '%y/%m/%d')
+AND DATE_FORMAT(EndTime, '%y/%m/%d') >= DATE_FORMAT('{startTime}', '%y/%m/%d')) 
+or ( DATE_FORMAT(StartTime, '%y/%m/%d') <= DATE_FORMAT('{endTime}', '%y/%m/%d')
+AND DATE_FORMAT(EndTime, '%y/%m/%d') >= DATE_FORMAT('{endTime}', '%y/%m/%d')) 
+ or (DATE_FORMAT(EndTime, '%y/%m/%d') <= DATE_FORMAT('{endTime}', '%y/%m/%d'))
+) ";
+            return Get<RB_System_Holiday>(sql).ToList();
+        }
+
+
     }
 }

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -67,6 +67,7 @@ namespace Edu.WebApi.Controllers.Course
                     item.ClassName,
                     item.School_Id,
                     item.SchoolName,
+                    item.CouseId,
                     item.CourseName,
                     item.Teacher_Id,
                     item.TeacherName,
@@ -79,7 +80,8 @@ namespace Edu.WebApi.Controllers.Course
                     item.ClassStatus,
                     item.Status,
                     item.OtherCourseList,
-                    item.ClassNo
+                    item.ClassNo,
+                    item.FinishTimeStr
                 });
             }
             pageModel.Count = rowsCount;
@@ -127,8 +129,9 @@ namespace Edu.WebApi.Controllers.Course
                 CouseId = base.ParmJObj.GetInt("CourseId",0),
                 IsQuerySurplus = base.ParmJObj.GetInt("IsQuerySurplus"),
                 School_Id = base.ParmJObj.GetInt("SchoolId",-1),
-                Teacher_Id = base.ParmJObj.GetInt("TeacherId", 0),
-                MoreStatus=base.ParmJObj.GetStringValue("MoreStatus")
+                MoreStatus=base.ParmJObj.GetStringValue("MoreStatus"),
+                Teacher_Id=base.ParmJObj.GetInt("Teacher_Id"),
+                IsQuerySurplusPlan=base.ParmJObj.GetInt("IsQuerySurplusPlan")
             };
             query.Group_Id = base.UserInfo.Group_Id;
             //if (query.School_Id == -1)
@@ -136,26 +139,40 @@ namespace Edu.WebApi.Controllers.Course
             //    query.School_Id = base.UserInfo.School_Id;
             //}
             var list = classModule.GetClassListModule(query);
-            if (list == null)
+
+            List<object> result = new List<object>();
+            foreach (var item in list)
             {
-                list = new List<RB_Class_ViewModel>();
-            }
-            if (IsAddDefault == 1)
+                List<object> planList = new List<object>();
+                if (item.ClassPlanList != null && item.ClassPlanList.Count > 0)
                 {
-                list.Insert(0, new RB_Class_ViewModel()
+                    foreach (var subItem in item.ClassPlanList)
                     {
-                    ClassId = 0,
-                    ClassName = "请选择"
-                });
+                        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);
                     }
-            return ApiResult.Success(data: list.Select(qitem => new
+                }
+                var obj = new
                 {
-                qitem.ClassId,
-                qitem.ClassName,
-                qitem.ClassHours,
-                qitem.CourseName,
-                OpenTime = Common.ConvertHelper.FormatDate(qitem.OpenTime)
-            }));
+                    item.ClassId,
+                    item.ClassName,
+                    item.CouseId,
+                    item.CourseName,
+                    OpenTime = Common.ConvertHelper.FormatDate(item.OpenTime),
+                    PlanList = planList
+                };
+                result.Add(obj);
+            }
+            return ApiResult.Success(data: result);
         }
 
         /// <summary>
@@ -1691,11 +1708,11 @@ namespace Edu.WebApi.Controllers.Course
                     foreach (var item in plan.Where(x => x.TeacherId == itemGroup.Key.TeacherId && x.ClassId == itemGroup.Key.ClassId))
                     {
 
-                        if (plan.Where(x => x.LessonPlanNum > 0).Count() < plan.Count() && plan.Where(x => x.LessonPlanNum > 0).Count() > 0)
+                        if (plan.Where(x => x.BeiKeStatus > 0).Count() < plan.Count() && plan.Where(x => x.BeiKeStatus > 0).Count() > 0)
                         {
                             IsLessonStatus = 1;
                         }
-                        else if (plan.Where(x => x.LessonPlanNum > 0).Count() == plan.Count())
+                        else if (plan.Where(x => x.BeiKeStatus > 0).Count() == plan.Count())
                         {
                             IsLessonStatus = 2;
                         }
@@ -1707,11 +1724,11 @@ namespace Edu.WebApi.Controllers.Course
                         foreach (var itemTime in item.PlanTimeList)
                         {
                             int IsPlanLessonStatus = 0;//0-未备课，1-部分，2-全部
-                            if (plan.Where(x => x.LessonPlanNum > 0 && x.ClassPlanId == itemTime.ClassPlanId).Count() < plan.Where(x => x.ClassPlanId == itemTime.ClassPlanId).Count() && plan.Where(x => x.LessonPlanNum > 0 && x.ClassPlanId == itemTime.ClassPlanId).Count() > 0)
+                            if (plan.Where(x => x.BeiKeStatus > 0 && x.ClassPlanId == itemTime.ClassPlanId).Count() < plan.Where(x => x.ClassPlanId == itemTime.ClassPlanId).Count() && plan.Where(x => x.BeiKeStatus > 0 && x.ClassPlanId == itemTime.ClassPlanId).Count() > 0)
                             {
                                 IsPlanLessonStatus = 1;
                             }
-                            else if (plan.Where(x => x.LessonPlanNum > 0 && x.ClassPlanId == itemTime.ClassPlanId).Count() == plan.Where(x => x.ClassPlanId == itemTime.ClassPlanId).Count())
+                            else if (plan.Where(x => x.BeiKeStatus > 0 && x.ClassPlanId == itemTime.ClassPlanId).Count() == plan.Where(x => x.ClassPlanId == itemTime.ClassPlanId).Count())
                             {
                                 IsPlanLessonStatus = 2;
                             }
@@ -1769,8 +1786,8 @@ namespace Edu.WebApi.Controllers.Course
 
                     planListResult.Add(new
                     {
-                        LessonPlanNum = plan.Where(x => x.ClassId == itemGroup.Key.ClassId && x.TeacherId == itemGroup.Key.TeacherId).FirstOrDefault()?.LessonPlanNum ?? 0,
-                        LessonPlanSummaryNum = plan.Where(x => x.ClassId == itemGroup.Key.ClassId && x.TeacherId == itemGroup.Key.TeacherId).FirstOrDefault()?.LessonPlanSummaryNum ?? 0,
+                        LessonPlanNum = plan.Where(x => x.ClassId == itemGroup.Key.ClassId && x.TeacherId == itemGroup.Key.TeacherId).FirstOrDefault()?.BeiKeStatus ?? 0,
+                        LessonPlanSummaryNum = plan.Where(x => x.ClassId == itemGroup.Key.ClassId && x.TeacherId == itemGroup.Key.TeacherId).FirstOrDefault()?.FanKuiStatus ?? 0,
                         Ranks = plan.Where(x => x.ClassId == itemGroup.Key.ClassId && x.TeacherId == itemGroup.Key.TeacherId).FirstOrDefault()?.Ranks ?? -1,
                         School_Id = plan.Where(x => x.ClassId == itemGroup.Key.ClassId && x.TeacherId == itemGroup.Key.TeacherId).FirstOrDefault()?.School_Id ?? -1,
                         ClassPlanId = plan.Where(x => x.ClassId == itemGroup.Key.ClassId && x.TeacherId == itemGroup.Key.TeacherId).FirstOrDefault()?.ClassPlanId ?? -1,

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -69,6 +69,7 @@ namespace Edu.WebApi.Controllers.Course
                     x.ClassName,
                     x.ClassNo,
                     x.CourseName,
+                    x.CouseId,
                     x.CourseFeature,
                     x.ClassHours,
                     x.TeacherName,

Edu.WebApi/Controllers/Course/TeacherClassController.cs

@@ -234,7 +234,7 @@ namespace Edu.WebApi.Controllers.Course
             {
                 if (item.EnterID > 0)
                 {
-                    item.EnterName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
+                    item.EnterName = UserReidsCache.GetUserLoginInfo(item.EnterID)?.AccountName ?? "";
                 }
                 result.Add(new
                 {

Edu.WebApi/Controllers/EduTask/ChangePlanController.cs

+using Edu.Common.API;
+using Edu.Common.Plugin;
+using Edu.Model.ViewModel.EduTask;
+using Edu.Module.EduTask;
+using Edu.WebApi.Filter;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Edu.WebApi.Controllers.EduTask
+{
+    /// <summary>
+    /// 改变流程相关申请
+    /// </summary>
+    [Route("api/[controller]/[action]")]
+    [ApiExceptionFilter]
+    [ApiController]
+    [EnableCors("AllowCors")]
+    public class ChangePlanController : BaseController
+    {
+        /// <summary>
+        /// 调课处理类对象
+        /// </summary>
+        private readonly ChangeClassPlanModule changeClassPlanModule = AOP.AOPHelper.CreateAOPObject<ChangeClassPlanModule>();
+
+
+        /// <summary>
+        /// 新增修改班级调课
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetChangeClassPlan()
+        {
+            var model = new RB_Change_ClassPlan_ViewModel()
+            {
+                Id=base.ParmJObj.GetInt("Id"),
+                ClassId=base.ParmJObj.GetInt("ClassId"),
+                CourseId=base.ParmJObj.GetInt("CourseId"),
+                ChangeType=base.ParmJObj.GetInt("ChangeType"),
+                MoveType=base.ParmJObj.GetInt("MoveType"),
+                SourceData=base.ParmJObj.GetStringValue("SourceData"),
+                TargetData=base.ParmJObj.GetStringValue("TargetData"),
+            };
+            model.Group_Id = base.UserInfo.Group_Id;
+            model.School_Id = base.UserInfo.School_Id;
+            model.CreateBy = base.UserInfo.Id;
+            model.CreateTime = DateTime.Now;
+            model.UpdateBy = base.UserInfo.Id;
+            model.UpdateTime = DateTime.Now;
+            bool flag = changeClassPlanModule.SetChangeClassPlanModule(model);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+    }
+}

Edu.WebApi/Controllers/EduTask/EducationReceiptController.cs

+using Edu.Common.API;
+using Edu.Model.ViewModel.EduTask;
+using Edu.Module.EduTask;
+using Edu.WebApi.Filter;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Edu.WebApi.Controllers.EduTask
+{
+    /// <summary>
+    /// 流程设置相关接口
+    /// </summary>
+    [Route("api/[controller]/[action]")]
+    [ApiExceptionFilter]
+    [ApiController]
+    [EnableCors("AllowCors")]
+    public class EducationReceiptController : BaseController
+    {
+        /// <summary>
+        /// 教务单据处理类对象
+        /// </summary>
+        private readonly EducationReceiptModule educationReceiptModule = AOP.AOPHelper.CreateAOPObject<EducationReceiptModule>();
+
+        /// <summary>
+        /// 获取教务单据分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetEducationReceiptPage()
+        {
+            var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
+            var query = new EducationReceiptQuery()
+            {
+                Group_Id = base.UserInfo.Group_Id,
+                
+            };
+           
+            var list = educationReceiptModule.GetEducationReceiptPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
+            pageModel.PageData = list;
+            pageModel.Count = rowsCount;
+            return ApiResult.Success(data: pageModel);
+        }
+
+    }
+
+
+}

Edu.WebApi/Controllers/Finance/FinanceController.cs

@@ -884,7 +884,7 @@ namespace Edu.WebApi.Controllers.Finance
                 }
             }
 
-            var obj = new { Status, UpdateStartTime, UpdateEndTime, list = list?.Select(y => new { y.ID, y.Year, y.BranchId, y.CostIds, y.Sort, ZhaiYao = y.Abstract, YiYue = y.January, ErYue = y.February, SanYue = y.March, DiYiJiDu = y.FirstQuarter, SiYue = y.April, WuYue = y.May, LiuYue = y.June, DiErJiDu = y.SecondQuarter, ShangBanNianBao = y.HalfReport, QiYue = y.July, BaYue = y.August, JiuYue = y.September, DiSanJiDu = y.ThirdQuarter, ShiYue = y.October, ShiYiYue = y.November, ShiErYue = y.December, DiSiJiDu = y.FourthQuarter, XiaBanNianBao = y.LastHalfReport, ZongJi = y.Total }) };
+            var obj = new { Status, UpdateStartTime, UpdateEndTime, list = list?.Select(y => new { y.ID, y.Year, y.BranchId, y.CostIds, y.CostTypeIds, y.Sort, ZhaiYao = y.Abstract, YiYue = y.January, ErYue = y.February, SanYue = y.March, DiYiJiDu = y.FirstQuarter, SiYue = y.April, WuYue = y.May, LiuYue = y.June, DiErJiDu = y.SecondQuarter, ShangBanNianBao = y.HalfReport, QiYue = y.July, BaYue = y.August, JiuYue = y.September, DiSanJiDu = y.ThirdQuarter, ShiYue = y.October, ShiYiYue = y.November, ShiErYue = y.December, DiSiJiDu = y.FourthQuarter, XiaBanNianBao = y.LastHalfReport, ZongJi = y.Total }) };
             return ApiResult.Success("", obj);
         }
 
@@ -2016,6 +2016,7 @@ namespace Edu.WebApi.Controllers.Finance
             string EndTime = base.ParmJObj.GetStringValue("EndTime");//结束时间
             int ClassId = base.ParmJObj.GetInt("ClassId", 0);
             string ClassNo = base.ParmJObj.GetStringValue("ClassNo");//班号
+            int SchoolId = base.ParmJObj.GetInt("SchoolId", -1);//校区id
             if (string.IsNullOrEmpty(StartTime))
             {
                 return ApiResult.ParamIsNull();
@@ -2034,7 +2035,7 @@ namespace Edu.WebApi.Controllers.Finance
                 return ApiResult.Failed("日期格式有误，请核实后再试");
             }
 
-            var Robj = financeModule.GetAllClassNowMonthStatistics(StartTime, EndTime, ClassId, ClassNo, userInfo);
+            var Robj = financeModule.GetAllClassNowMonthStatistics(StartTime, EndTime, ClassId, ClassNo, SchoolId, userInfo);
             return ApiResult.Success("", Robj);
         }
 

Edu.WebApi/Controllers/Public/FlowController.cs

@@ -72,5 +72,50 @@ namespace Edu.WebApi.Controllers.Public
             var flag = basicFlowModule.SetFlowModule(extModel);
             return flag ? ApiResult.Success(data: extModel) : ApiResult.Failed();
         }
+
+        /// <summary>
+        /// 获取调课流程
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetChangeClassFlow()
+        {
+            var FlowId = base.ParmJObj.GetInt("FlowId");
+            var flowModel = basicFlowModule.GetFlowModule(FlowId);
+            return ApiResult.Success(data: flowModel);
+        }
+
+        /// <summary>
+        /// 新增修改调课流程
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetChangeClassFlow()
+        {
+            var extModel = new RB_Flow_ViewModel()
+            {
+                FlowId = base.ParmJObj.GetInt("FlowId"),
+                FlowName = base.ParmJObj.GetStringValue("FlowName"),
+                Group_Id = base.UserInfo.Group_Id,
+                CreateBy = base.UserInfo.Id,
+                CreateTime = DateTime.Now,
+                Status = Common.Enum.DateStateEnum.Normal,
+                UpdateBy = base.UserInfo.Id,
+                UpdateTime = DateTime.Now,
+            };
+            if (!string.IsNullOrEmpty(base.ParmJObj.GetStringValue("FlowNodeList")))
+            {
+                try
+                {
+                    extModel.FlowNodeList = Common.Plugin.JsonHelper.DeserializeObject<List<RB_Flow_Node_ViewModel>>(base.ParmJObj.GetStringValue("FlowNodeList"));
+                }
+                catch (Exception ex)
+                {
+                    Common.Plugin.LogHelper.Write(ex, "SetChangeClassFlow_FlowNodeList");
+                }
+            }
+            var flag = basicFlowModule.SetFlowModule(extModel);
+            return flag ? ApiResult.Success(data: extModel) : ApiResult.Failed();
+        }
     }
 }

Edu.WebApi/Controllers/Public/HolidayController.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Edu.Common.API;
+using Edu.Common.Plugin;
+using Edu.Model.CacheModel;
+using Edu.Model.Entity.System;
+using Edu.Module.System;
+using Edu.WebApi.Filter;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+
+namespace Edu.WebApi.Controllers.Public
+{
+    [Route("api/[controller]/[action]")]
+    [ApiExceptionFilter]
+    [ApiController]
+    [EnableCors("AllowCors")]
+    public class HolidayController : BaseController
+    {
+        /// <summary>
+        /// 节假日处理类对象
+        /// </summary>
+        private readonly HolidayModule holidayModule = new HolidayModule();
+
+        /// <summary>
+        /// 班级处理类对象
+        /// </summary>
+        private readonly Module.Course.ClassModule classModule = new Module.Course.ClassModule();
+
+        #region 节假日管理
+        /// <summary>
+        /// 新增修改广告基础信息
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+
+        [HttpPost]
+        public ApiResult SetHoliday()
+        {
+            UserInfo userInfo = base.UserInfo;
+
+            var startDate = base.ParmJObj.GetStringValue("StartTime");
+            var endDate = base.ParmJObj.GetStringValue("EndTime");
+
+            if (string.IsNullOrEmpty(startDate))
+            {
+                return ApiResult.Failed("节假日开始时间不能为空");
+            }
+            if (string.IsNullOrEmpty(endDate))
+            {
+                return ApiResult.Failed("节假日结束时间不能为空");
+            }
+            RB_System_Holiday dmodel = new RB_System_Holiday
+            {
+                DayType = base.ParmJObj.GetInt("DayType", 0),
+                StartTime = Convert.ToDateTime(startDate),
+                EndTime = Convert.ToDateTime(endDate)
+            };
+            if (dmodel.StartTime > dmodel.EndTime)
+            {
+                return ApiResult.Failed("节假日开始时间不能大于结束时间");
+            }
+            //先判断日期是否已存在
+            var oldList = holidayModule.GetExistHoliday(startDate, endDate);
+            if (oldList != null && oldList.Any(x => x.HolidayId != dmodel.HolidayId))
+            {
+                return ApiResult.Failed("节假日时间范围重合");
+            }
+
+            if (dmodel.DayType == 1)//判断节假日是否有排课计划
+            {
+                var planList = classModule.GetClassPlanList_V3(new Model.ViewModel.Course.RB_Class_Plan_ViewModel
+                {
+                    Group_Id = userInfo.Group_Id,
+                    StartTime = dmodel.StartTime.ToString("yyyy-MM-dd 00:00:00"),
+                    EndTime = dmodel.EndTime.ToString("yyyy-MM-dd 00:00:00")
+                });
+
+                if (planList != null && planList.Any())
+                {
+                    return ApiResult.Failed("班级：" + string.Join(",", planList.Select(x => x.ClassName)) + "存在排课");
+                }
+            }
+
+            if (dmodel.HolidayId == 0)
+            {
+                dmodel.CreateDate = System.DateTime.Now;
+                dmodel.Status = 0;
+                dmodel.Group_Id = userInfo.Group_Id;
+                dmodel.School_Id = userInfo.School_Id;
+            }
+            bool flag = holidayModule.SetHoliday(dmodel);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 删除节假日
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult DelHoliday()
+        {
+            var HolidayId = base.ParmJObj.GetInt("HolidayId");
+            if (HolidayId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+            var flag = holidayModule.DelHoliday(HolidayId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 获取节假日列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetHolidayList()
+        {
+            UserInfo userInfo = base.UserInfo;
+            ResultPageModel pmodel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
+            RB_System_Holiday dmodel = new RB_System_Holiday
+            {
+                DayType = base.ParmJObj.GetInt("DayType", 0)
+            };
+
+            List<RB_System_Holiday> list = holidayModule.GetPageList(pmodel.PageIndex, pmodel.PageSize, dmodel, out long count);
+
+            pmodel.Count = Convert.ToInt32(count.ToString());
+            pmodel.PageData = list.Select(x => new
+            {
+                x.HolidayId,
+                StartTime = x.StartTime.ToString("yyyy-MM-dd"),
+                EndTime = x.EndTime.ToString("yyyy-MM-dd"),
+                x.DayType
+            });
+            return ApiResult.Success("", pmodel);
+        }
+
+        /// <summary>
+        /// 获取节假日详情
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetHolidayInfo()
+        {
+            int HolidayId = base.ParmJObj.GetInt("HolidayId", 0);
+            if (HolidayId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+            var model = holidayModule.GetEntity(HolidayId);
+            if (model != null)
+            {
+                var obj = new
+                {
+                    model.HolidayId,
+                    StartTime = model.StartTime.ToString("yyyy-MM-dd"),
+                    EndTime = model.EndTime.ToString("yyyy-MM-dd"),
+                    model.DayType
+                };
+                return ApiResult.Success("请求成功！", obj);
+            }
+            else
+            {
+
+                return ApiResult.Failed("请求失败，数据不存在！");
+            }
+        }
+        #endregion
+
+    }
+}

Edu.WebApi/Edu.WebApi.csproj

@@ -40,6 +40,7 @@
     <ProjectReference Include="..\Edu.Module.Advertising\Edu.Module.Advertising.csproj" />
     <ProjectReference Include="..\Edu.Module.Course\Edu.Module.Course.csproj" />
     <ProjectReference Include="..\Edu.Module.Duty\Edu.Module.Duty.csproj" />
+    <ProjectReference Include="..\Edu.Module.EduTask\Edu.Module.EduTask.csproj" />
     <ProjectReference Include="..\Edu.Module.Finance\Edu.Module.Finance.csproj" />
     <ProjectReference Include="..\Edu.Module.OKR\Edu.Module.OKR.csproj" />
     <ProjectReference Include="..\Edu.Module.Public\Edu.Module.Public.csproj" />

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}