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

Edu.Model/Entity/Activity/RB_Activity_Config.cs

+using Edu.Common.Enum;
+using Edu.Common.Enum.Course;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Course
+{
+    /// <summary>
+    /// 活动配置实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Activity_Config
+    {
+        /// <summary>
+        /// id
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 类型  1按人头   2百分比
+        /// </summary>
+        public int Type { get; set; }
+
+        /// <summary>
+        /// 提成金额/比例   
+        /// </summary>
+        public decimal CommissionMoney { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 集团id
+        /// </summary>
+        public int Group_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; }
+    }
+}

Edu.Model/Entity/Activity/RB_Activity_Periods.cs

+using Edu.Common.Enum;
+using Edu.Common.Enum.Course;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Course
+{
+    /// <summary>
+    /// 活动期数实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Activity_Periods
+    {
+        /// <summary>
+        ///  编号
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 期数
+        /// </summary>
+        public string Periods { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建日期
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 累计金额
+        /// </summary>
+        public decimal SumPrice { get; set; }
+
+        /// <summary>
+        /// 集团编号
+        /// </summary>
+        public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 关联财务单据ids
+        /// </summary>
+        public string Financials { get; set; }
+
+        /// <summary>
+        /// 已发放人员列表
+        /// </summary>
+        public string EmpIds { get; set; }
+
+    }
+}

Edu.Model/Entity/Activity/RB_Activity_PeriodsDetail.cs

+using Edu.Common.Enum;
+using Edu.Common.Enum.Course;
+using System;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Course
+{
+    /// <summary>
+    /// 活动期数明细实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Activity_PeriodsDetail
+    {
+        /// <summary>
+        /// 编号
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 关联用户
+        /// </summary>
+        public int UserId { get; set; }
+
+        /// <summary>
+        /// 活动id
+        /// </summary>
+        public int ActivityId { get; set; }
+
+        /// <summary>
+        /// 订单ID
+        /// </summary>
+        public int OrderId { get; set; }
+
+        /// <summary>
+        /// 提成金额
+        /// </summary>
+        public decimal CommissionMoney { get; set; }
+
+        /// <summary>
+        /// 期数id
+        /// </summary>
+        public int PeriodId { get; set; }
+
+        /// <summary>
+        /// 期号
+        /// </summary>
+        public string Periods { get; set; }
+
+        /// <summary>
+        /// 部门id
+        /// </summary>
+        public int Depart_Id { get; set; }
+
+        /// <summary>
+        /// 校区id
+        /// </summary>
+        public int School_Id { get; set; }
+
+        /// <summary>
+        /// 集团id
+        /// </summary>
+        public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 电商报名用户Id
+        /// </summary>
+        public int DSUserId { get; set; }
+
+        /// <summary>
+        /// 电商报名用户名称
+        /// </summary>
+        public string DSUserName { get; set; }
+
+        /// <summary>
+        /// 活动名称
+        /// </summary>
+        public string ActivityName { get; set; }
+
+        /// <summary>
+        /// 提成类型  1人头   2比例
+        /// </summary>
+        public int CType { get; set; }
+
+        /// <summary>
+        /// 提成金额/比例
+        /// </summary>
+        public decimal CMoney { get; set; }
+
+        /// <summary>
+        /// 活动时间
+        /// </summary>
+        public DateTime ActivityTime { get; set; }
+    }
+}

Edu.Model/ViewModel/Activity/RB_Activity_PeriodsDetail_ViewModel.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Edu.Common.Enum.Sale;
+using Edu.Model.Entity.Course;
+
+namespace Edu.Model.ViewModel.Course
+{
+    /// <summary>
+    /// 活动配置视图实体类
+    /// </summary>
+    public class RB_Activity_PeriodsDetail_ViewModel : RB_Activity_PeriodsDetail
+    {
+        /// <summary>
+        /// 用户ids
+        /// </summary>
+        public string UserIds { get; set; }
+
+        /// <summary>
+        /// 订单ids
+        /// </summary>
+        public string OrderIds { get; set; }
+
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        public string UserName { get; set; }
+
+        /// <summary>
+        /// 部门名称
+        /// </summary>
+        public string DeptName { get; set; }
+        /// <summary>
+        /// 校区名称
+        /// </summary>
+        public string SchoolName { get; set; }
+    }
+}

Edu.Model/ViewModel/Activity/RB_Activity_Periods_ViewModel.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Edu.Common.Enum.Sale;
+using Edu.Model.Entity.Course;
+
+namespace Edu.Model.ViewModel.Course
+{
+    /// <summary>
+    /// 活动期数视图实体类
+    /// </summary>
+    public class RB_Activity_Periods_ViewModel : RB_Activity_Periods
+    {
+        
+    }
+}

Edu.Model/ViewModel/Activity/RB_Class_Check_ViewModel.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Edu.Common.Enum.Sale;
+using Edu.Model.Entity.Course;
+
+namespace Edu.Model.ViewModel.Course
+{
+    /// <summary>
+    /// 活动配置视图实体类
+    /// </summary>
+    public class RB_Activity_Config_ViewModel : RB_Activity_Config
+    {
+        
+    }
+}

Edu.Model/ViewModel/Course/RB_Order_Guest_ViewModel.cs

@@ -247,5 +247,11 @@ namespace Edu.Model.ViewModel.Course
         /// 上课计划id
         /// </summary>
         public int ClassPlanId { get; set; }
+
+        /// <summary>
+        /// 合同总课时
+        /// </summary>
+        public int ContractTotalHours { get; set; }
+
     }
 }
\ No newline at end of file

Edu.Module.Course/ClassModule.cs

 using Edu.AOP.CustomerAttribute;
+using Edu.Cache.User;
 using Edu.Common.Enum;
 using Edu.Common.Enum.Course;
 using Edu.Common.Plugin;
@@ -1279,7 +1280,7 @@ namespace Edu.Module.Course
         /// </summary>
         /// <param name="classId">班级编号</param>
         /// <returns></returns>
-        public object GetClassStudentListModule(int classId, int school_Id, int group_Id, int ClassTimeId, int QEffectStatus = 0)
+        public object GetClassStudentListModule(int classId, int school_Id, int group_Id, int ClassTimeId, int QEffectStatus = 0,int QNoFinish=0)
         {
             List<object> list = new List<object>();
             var orderStudentList = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel()
@@ -1302,6 +1303,10 @@ namespace Edu.Module.Course
                 var classTimeModel = class_TimeRepository.GetClassTimeList_V2(new RB_Class_Time_ViewModel { ClassTimeId = ClassTimeId, Group_Id = group_Id }).FirstOrDefault();
                 orderStudentList = orderStudentList.Where(x => x.GuestState == 1 || x.GuestState == 6 || ((x.GuestState == 5 || x.GuestState == 7) && x.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.ChangeEffectTime)) >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(classTimeModel.NewPlanDateTime)))).ToList();
             }
+            if (QNoFinish == 1)
+            {
+                orderStudentList = orderStudentList.Where(qitem => qitem.GuestState == 1&&(qitem.TotalHours-qitem.CompleteHours)>0).ToList();
+            }
             if (orderStudentList != null && orderStudentList.Count > 0)
             {
                 foreach (var item in orderStudentList)
@@ -1321,6 +1326,13 @@ namespace Edu.Module.Course
                         CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
                         item.Mobile,
                         item.OrderId,
+                        EnterName= UserReidsCache.GetUserLoginInfo(item.EnterID)?.AccountName??"",
+                        item.ContractTotalHours,
+                        item.TotalHours,
+                        item.CompleteHours,
+                        item.ValidClassHours,
+                        SurplusHours=item.TotalHours-item.CompleteHours,
+                        item.MakeUpHours,
                         ClassHours = item.CompleteHours + "-" + (classModel?.ClassHours ?? 0),
                         IsRenew = item.IsRenewOrder,
                         item.RenewOrderId,

Edu.Module.Course/OrderModule2.cs

@@ -90,16 +90,13 @@ namespace Edu.Module.Course
                 backNum = totalBackCount.ToString();
             }
        
-            //基础课时分钟数
-            var BasicMinutes = class_ConfigRepository.GetClassMinutesRepository(orderModel.ClassId);
+      
             var stuCheckList = class_CheckRepository.GetGuestFinishMinutesRepository(GuestId.ToString());
-            //总签到上课分钟数
-            var totalFinishMinutes = stuCheckList?.Sum(qitem => qitem.FinishMinutes) ?? 0;
             //完成课时数
-            var FinishHours = Convert.ToInt32(totalFinishMinutes) / BasicMinutes;
+            var FinishHours = stuCheckList?.Sum(qitem => qitem.FinishClassHours) ?? 0;
 
             //课时单价
-            var classHourPrice = Math.Round(orderModel.PreferPrice / orderModel.GuestNum / classModel.ClassHours, 2);
+            var classHourPrice = orderModel.PreferPrice / orderModel.GuestNum / classModel.ClassHours;
             //预计退款金额
             decimal backMoney =0;
             //backMoney = (classModel.ClassHours - FinishHours) * classHourPrice;
@@ -116,7 +113,7 @@ namespace Edu.Module.Course
                 ClassId = orderModel.ClassId,
                 CreateBy = userinfo.Id,
                 CreateTime = DateTime.Now,
-                FinishHours = FinishHours,
+                FinishHours = Convert.ToInt32(FinishHours),
                 Group_Id = userinfo.Group_Id,
                 GuestId = GuestId,
                 SchoolId = guestModel.School_Id,

Edu.Module.Course/StudentBillModule.cs

@@ -31,8 +31,6 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly RB_Student_BackClassRepository student_BackClassRepository = new RB_Student_BackClassRepository();
 
-
-
         /// <summary>
         /// 旅客表仓储层对象
         /// </summary>
@@ -53,23 +51,16 @@ namespace Edu.Module.Course
         /// </summary>
         private readonly RB_SchoolRepository schoolRepository = new RB_SchoolRepository();
 
-
         /// <summary>
         /// 日志
         /// </summary>
         private readonly RB_User_ChangeLogRepository changeLogRepository = new RB_User_ChangeLogRepository();
 
-        /// <summary>
-        /// 班级基础配置表仓储层对象
-        /// </summary>
-        private readonly RB_Class_ConfigRepository class_ConfigRepository = new RB_Class_ConfigRepository();
-
         /// <summary>
         /// 学员签到仓储层对象
         /// </summary>
         private readonly RB_Class_CheckRepository class_CheckRepository = new RB_Class_CheckRepository();
 
-
         /// <summary>
         /// 学员事件记录仓储层
         /// </summary>
@@ -98,21 +89,20 @@ namespace Edu.Module.Course
         public object GetBackBillMoneyModule(int BackId)
         {
             var backModel = student_BackClassRepository.GetEntity(BackId);
-            var guestModel = order_GuestRepository.GetEntity(backModel.GuestId);
             var orderModel = orderRepository.GetEntity(backModel.OrderId);
             //班级实体类
             var classModel = classRepository.GetEntity(backModel.ClassId);
-            //基础课时分钟数
-            var BasicMinutes = class_ConfigRepository.GetClassMinutesRepository(backModel.ClassId);
             var stuCheckList = class_CheckRepository.GetGuestFinishMinutesRepository(backModel.GuestId.ToString());
-            //总签到上课分钟数
-            var totalFinishMinutes = stuCheckList?.Sum(qitem => qitem.FinishMinutes) ?? 0;
             //完成课时数
-            var FinishHours = Convert.ToInt32(totalFinishMinutes) / BasicMinutes;
+            var FinishHours = stuCheckList?.Sum(qitem => qitem.FinishClassHours) ?? 0;
             //课时单价
-            var classHourPrice = Math.Round(orderModel.PreferPrice / orderModel.GuestNum / classModel.ClassHours, 2);
+            var classHourPrice = orderModel.PreferPrice / orderModel.GuestNum / classModel.ClassHours;
+             
             //预计退款金额
-            var backMoney = (classModel.ClassHours - FinishHours) * classHourPrice;
+            decimal backMoney = 0;
+            //违约金
+            decimal breakContractPrice = (classModel.ClassHours - FinishHours) * classHourPrice * Convert.ToDecimal(0.1);
+            backMoney = (orderModel.Income + orderModel.PlatformTax) - FinishHours * classHourPrice - breakContractPrice;
             var obj = new
             {
                 orderModel.PreferPrice,

Edu.Repository/Activity/RB_Activity_ConfigRepository.cs

+using Edu.Common.Enum;
+using Edu.Model.Entity.Course;
+using Edu.Model.ViewModel.Course;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Edu.Repository.Course
+{
+    /// <summary>
+    /// 活动配置仓储层
+    /// </summary>
+    public class RB_Activity_ConfigRepository : BaseRepository<RB_Activity_Config>
+    {
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <param name="orderIds"></param>
+        /// <returns></returns>
+        public List<RB_Activity_Config_ViewModel> GetList(RB_Activity_Config_ViewModel demodel)
+        {
+            string where = $@" 1=1 and r.Status =0";
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_Config.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.Type > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_Config.Type)} ={demodel.Type}";
+            }
+
+            string sql = $@" 
+SELECT * From RB_Activity_Config r
+WHERE {where} 
+ORDER BY r.Id DESC ";
+            return Get<RB_Activity_Config_ViewModel>(sql).ToList();
+        }
+
+    }
+}

Edu.Repository/Activity/RB_Activity_PeriodsDetailRepository.cs

+using Edu.Common.Enum;
+using Edu.Model.Entity.Course;
+using Edu.Model.ViewModel.Course;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Edu.Repository.Course
+{
+    /// <summary>
+    /// 活动周期明细仓储层
+    /// </summary>
+    public class RB_Activity_PeriodsDetailRepository : BaseRepository<RB_Activity_PeriodsDetail>
+    {
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Activity_PeriodsDetail_ViewModel> GetList(RB_Activity_PeriodsDetail_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.PeriodId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.PeriodId)} ={demodel.PeriodId}";
+            }
+            if (demodel.UserId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.UserId)} ={demodel.UserId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.UserIds))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.UserId)} in({demodel.UserIds})";
+            }
+            if (demodel.ActivityId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.ActivityId)} ={demodel.ActivityId}";
+            }
+            if (demodel.OrderId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.OrderId)} ={demodel.OrderId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.OrderIds))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.OrderId)} in({demodel.OrderIds})";
+            }
+            if (!string.IsNullOrEmpty(demodel.ActivityName))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.ActivityName)} like '%{demodel.ActivityName}%'";
+            }
+
+
+            string sql = $@" select r.* from RB_Activity_PeriodsDetail r where {where} order by r.Id asc";
+            return Get<RB_Activity_PeriodsDetail_ViewModel>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取分页列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Activity_PeriodsDetail_ViewModel> GetPageList(int pageIndex,int pageSize,out long count,RB_Activity_PeriodsDetail_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.PeriodId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.PeriodId)} ={demodel.PeriodId}";
+            }
+            if (demodel.UserId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.UserId)} ={demodel.UserId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.UserIds))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.UserId)} in({demodel.UserIds})";
+            }
+            if (demodel.ActivityId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.ActivityId)} ={demodel.ActivityId}";
+            }
+            if (demodel.OrderId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.OrderId)} ={demodel.OrderId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.OrderIds))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.OrderId)} in({demodel.OrderIds})";
+            }
+            if (demodel.DSUserId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.DSUserId)} ={demodel.DSUserId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.ActivityName))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.ActivityName)} like '%{demodel.ActivityName}%'";
+            }
+            if (!string.IsNullOrEmpty(demodel.DSUserName))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.DSUserName)} like '%{demodel.DSUserName}%'";
+            }
+
+            string sql = $@" select r.* from RB_Activity_PeriodsDetail r where {where} order by r.Id asc";
+            return GetPage<RB_Activity_PeriodsDetail_ViewModel>(pageIndex, pageSize, out count, sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取用户提成列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Activity_PeriodsDetail_ViewModel> GetActivityCommissionUserList(RB_Activity_PeriodsDetail_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.School_Id >= 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.School_Id)} ={demodel.School_Id}";
+            }
+            if (demodel.PeriodId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.PeriodId)} ={demodel.PeriodId}";
+            }
+            if (demodel.UserId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.UserId)} ={demodel.UserId}";
+            }
+            if (demodel.ActivityId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.ActivityId)} ={demodel.ActivityId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.ActivityName))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.ActivityName)} like '%{demodel.ActivityName}%'";
+            }
+            if (demodel.OrderId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.OrderId)} ={demodel.OrderId}";
+            }
+
+
+            string sql = $@" select r.UserId,r.Depart_Id,r.School_Id,sum(r.CommissionMoney) as CommissionMoney 
+from RB_Activity_PeriodsDetail r where {where} group by r.UserId,r.Depart_Id,r.School_Id";
+            return Get<RB_Activity_PeriodsDetail_ViewModel>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 累计提成金额
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public decimal GetSellCommissionStatistics(RB_Activity_PeriodsDetail_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.PeriodId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.PeriodId)} ={demodel.PeriodId}";
+            }
+            if (demodel.UserId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.UserId)} ={demodel.UserId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.UserIds))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.UserId)} in({demodel.UserIds})";
+            }
+            if (demodel.ActivityId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.ActivityId)} ={demodel.ActivityId}";
+            }
+            if (demodel.OrderId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.OrderId)} ={demodel.OrderId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.OrderIds))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.OrderId)} in({demodel.OrderIds})";
+            }
+            if (demodel.DSUserId > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.DSUserId)} ={demodel.DSUserId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.ActivityName))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.ActivityName)} like '%{demodel.ActivityName}%'";
+            }
+            if (!string.IsNullOrEmpty(demodel.DSUserName))
+            {
+                where += $@" and r.{nameof(RB_Activity_PeriodsDetail_ViewModel.DSUserName)} like '%{demodel.DSUserName}%'";
+            }
+
+            string sql = $@" select sum(r.CommissionMoney) from RB_Sell_Commission_Details r where {where}";
+            var obj = ExecuteScalar(sql);
+            return obj == null ? 0 : Convert.ToDecimal(obj);
+        }
+
+    }
+}

Edu.Repository/Activity/RB_Activity_PeriodsRepository.cs

+using Edu.Common.Enum;
+using Edu.Model.Entity.Course;
+using Edu.Model.ViewModel.Course;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using VT.FW.DB.Dapper;
+
+namespace Edu.Repository.Course
+{
+    /// <summary>
+    /// 活动周期仓储层
+    /// </summary>
+    public class RB_Activity_PeriodsRepository : BaseRepository<RB_Activity_Periods>
+    {
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Activity_Periods_ViewModel> GetList(RB_Activity_Periods_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_Periods_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (!string.IsNullOrEmpty(demodel.Name))
+            {
+                where += $@" and r.{nameof(RB_Activity_Periods_ViewModel.Name)} like '%{demodel.Name}%'";
+            }
+            if (!string.IsNullOrEmpty(demodel.Periods))
+            {
+                where += $@" and r.{nameof(RB_Activity_Periods_ViewModel.Periods)} ='{demodel.Periods}'";
+            }
+
+            string sql = $@" select r.* from RB_Activity_Periods r where {where} order by r.Id desc";
+            return Get<RB_Activity_Periods_ViewModel>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Activity_Periods_ViewModel> GetPageList(int pageIndex, int pageSize, out long count, RB_Activity_Periods_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Activity_Periods_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (!string.IsNullOrEmpty(demodel.Name))
+            {
+                where += $@" and r.{nameof(RB_Activity_Periods_ViewModel.Name)} like '%{demodel.Name}%'";
+            }
+
+            string sql = $@" select r.* from RB_Activity_Periods r where {where} order by r.Id desc";
+            return GetPage<RB_Activity_Periods_ViewModel>(pageIndex, pageSize, out count, sql).ToList();
+        }
+
+    }
+}

Edu.Repository/Course/RB_Order_GuestRepository.cs

@@ -114,11 +114,12 @@ namespace Edu.Repository.Course
 
             string sql = $@" 
 SELECT A.*,IFNULL(B.JoinType,0) AS JoinType,IFNULL(B.TargetJoinType,0) AS TargetJoinType,IFNULL(B.StartClassHours,0) AS StartClassHours
-       ,IFNULL(C.CourseName,'') AS CourseName,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId,B.IsRenewOrder,B.RenewOrderId
-       ,sc.StopClassEffectTime,B.SourceOrderId,B.TargetOrderId
+       ,IFNULL(C.CourseName,'') AS CourseName,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId,B.IsRenewOrder,B.RenewOrderId,B.EnterID
+       ,sc.StopClassEffectTime,B.SourceOrderId,B.TargetOrderId,IFNULL(D.FirstClassHours,0)+IFNULL(D.SecondClassHours,0)+IFNULL(D.ThirdClassHours,0) AS ContractTotalHours
 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)
      LEFT JOIN (SELECT OrderGuestId,MAX(TakeEffectTime) as StopClassEffectTime from rb_student_stopclass where IsAuditThrough=1 GROUP BY OrderGuestId) as sc on sc.OrderGuestId=a.Id
+     LEFT JOIN rb_education_contract AS D ON A.OrderId=D.OrderId AND A.Id=D.GuestId AND D.IsSystemUse=1
 WHERE 1=1 and A.Status=0 {where}";
             return Get<RB_Order_Guest_ViewModel>(sql).ToList();
         }

Edu.Repository/EduTask/RB_Education_ReceiptRepository.cs

@@ -107,7 +107,7 @@ WHERE 1=1
                     {
                         //待我审批
                         case Common.Enum.Course.EduReceiptConditionEnum.WaitAgree:
-                            builder.AppendFormat(" AND EXISTS (SELECT 1 FROM rb_education_record WHERE ConditionId=A.Id AND AuditStatus=1 AND AuditEmId={0}) ", query.CreateBy);
+                            builder.AppendFormat(" AND A.VerifyStatus NOT IN(6) AND EXISTS (SELECT 1 FROM rb_education_record WHERE ConditionId=A.Id AND AuditStatus=1 AND AuditEmId={0}) ", query.CreateBy);
                             break;
                         //已审批的
                         case Common.Enum.Course.EduReceiptConditionEnum.Agree:

Edu.Repository/System/RB_Menu_FunctionRepository.cs

@@ -104,6 +104,14 @@ WHERE 1=1 AND A.Status=0 AND A.Id IN(SELECT Action_Id FROM rb_role_functionpermi
         /// <returns></returns>
         public bool CheckUserFunctionRepository(string actionCode, string postIds)
         {
+            if (string.IsNullOrEmpty(actionCode))
+            {
+                return false;
+            }
+            if (string.IsNullOrEmpty(postIds))
+            {
+                return false;
+            }
             int result = 0;
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -726,8 +726,8 @@ namespace Edu.WebApi.Controllers.Course
             var classId = base.ParmJObj.GetInt("ClassId");
             var schoolId = 0;
             int QEffectStatus = base.ParmJObj.GetInt("QEffectStatus");
-            //var schoolId = base.ParmJObj.GetInt("School_Id");
-            var data = classModule.GetClassStudentListModule(classId, schoolId, base.UserInfo.Group_Id, 0, QEffectStatus: QEffectStatus);
+            int QNoFinish = base.ParmJObj.GetInt("QNoFinish");
+            var data = classModule.GetClassStudentListModule(classId, schoolId, base.UserInfo.Group_Id, 0, QEffectStatus: QEffectStatus, QNoFinish: QNoFinish);
             return ApiResult.Success(data: data);
         }