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

Edu.Common/Enum/Course/BonusStateEnum.cs

+using Edu.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Common.Enum.Course
+{
+    /// <summary>
+    /// 教师奖金状态枚举
+    /// </summary>
+    public enum BonusStateEnum
+    {
+        /// <summary>
+        /// 待确认
+        /// </summary>
+        [EnumField("待确认")]
+        Wait = 1,
+
+        /// <summary>
+        /// 已确认
+        /// </summary>
+        [EnumField("已确认")]
+        Confirmed = 2,
+        /// <summary>
+        /// 取消
+        /// </summary>
+        [EnumField("取消")]
+        Cancel = 3,
+        /// <summary>
+        /// 生成中
+        /// </summary>
+        [EnumField("生成中")]
+        Create = 4
+    }
+}

Edu.Model/Entity/Course/RB_Class_Config.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Course
+{
+    /// <summary>
+    /// 班级基础配置实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Class_Config
+    {
+        /// <summary>
+        /// 基础设置主键
+        /// </summary>
+        public int ConfigId { get; set; }
+
+        /// <summary>
+        /// 基础课时费用
+        /// </summary>
+        public decimal BasicHourFee { get; set; }
+
+        /// <summary>
+        /// 基础带班人数
+        /// </summary>
+        public int BasicClassNum { get; set; }
+
+        /// <summary>
+        /// 课时分钟数
+        /// </summary>
+        public int BasicMinutes { get; set; }
+
+        /// <summary>
+        /// 集团编号
+        /// </summary>
+        public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public int UpdateBy { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime UpdateTime { get; set; }
+    }
+}

Edu.Model/Entity/Course/RB_Class_Type.cs

+using Edu.Common.Enum;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Course
+{
+    /// <summary>
+    /// 班级类型费用设置实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Class_Type
+    {
+		/// <summary>
+		/// 班级类型主键编号
+		/// </summary>
+		public int CTypeId { get; set; }
+
+		/// <summary>
+		/// 类型名称
+		/// </summary>
+		public string CTypeName { get; set; }
+
+		/// <summary>
+		/// 课时费加价
+		/// </summary>
+		public decimal AddHourFee { get; set; }
+
+		/// <summary>
+		/// 默认班级人数
+		/// </summary>
+		public int DefaultClassNum { get; set; }
+
+		/// <summary>
+		/// 集团编号
+		/// </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; }
+
+		/// <summary>
+		/// 删除状态
+		/// </summary>
+		public DateStateEnum Status { get; set; }
+	}
+}

Edu.Model/Entity/Course/RB_Teaching_Bonus.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_Teaching_Bonus
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 月份
+        /// </summary>
+        public string Month { get; set; }
+
+        /// <summary>
+        /// 教师ids
+        /// </summary>
+        public string TeacherIds { get; set; }
+
+        /// <summary>
+        /// 总金额
+        /// </summary>
+        public decimal Money { get; set; }
+
+        /// <summary>
+        /// 财务单据id
+        /// </summary>
+        public int FinanceId { get; set; }
+
+        /// <summary>
+        /// 状态  枚举 1待确认  2已确认  3取消  4生成中
+        /// </summary>
+        public BonusStateEnum State { 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; }
+    }
+}

Edu.Model/Entity/Course/RB_Teaching_BonusDetail.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_Teaching_BonusDetail
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int BonusId { get; set; }
+
+        /// <summary>
+        /// 日期
+        /// </summary>
+        public DateTime Date { get; set; }
+
+        /// <summary>
+        /// 教师id
+        /// </summary>
+        public int TeacherId { get; set; }
+
+        /// <summary>
+        /// 班级id
+        /// </summary>
+        public int ClassId { get; set; }
+
+        /// <summary>
+        /// 类型  1带班  2代课
+        /// </summary>
+        public int Type { get; set; }
+
+        /// <summary>
+        /// 课时
+        /// </summary>
+        public int CourseHour { get; set; }
+
+        /// <summary>
+        /// 课时费
+        /// </summary>
+
+        public decimal UnitPrice { get; set; }
+
+        /// <summary>
+        /// 签到人数
+        /// </summary>
+        public int CheckInNum { get; set; }
+
+        /// <summary>
+        /// 小计金额
+        /// </summary>
+        public decimal Money { get; set; }
+
+        /// <summary>
+        /// 删除状态
+        /// </summary>
+        public int Status { 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; }
+    }
+}

Edu.Model/Entity/User/RB_Assist.cs

@@ -138,5 +138,10 @@ namespace Edu.Model.Entity.User
 		/// 离职时间
 		/// </summary>
 		public DateTime? LeaveTime { get; set; }
+
+		/// <summary>
+		/// 邮箱
+		/// </summary>
+		public string Email { get; set; }
 	}
 }
\ No newline at end of file

Edu.Model/Entity/User/RB_Manager.cs

@@ -116,5 +116,10 @@ namespace Edu.Model.Entity.User
 		/// 离职时间
 		/// </summary>
 		public DateTime? LeaveTime { get; set; }
+
+		/// <summary>
+		/// 邮箱
+		/// </summary>
+		public string Email { get; set; }
 	}
 }

Edu.Model/Entity/User/RB_Teacher.cs

@@ -167,5 +167,15 @@ namespace Edu.Model.Entity.User
         /// 带班基础人数 2020-12-10 Add by:w
         /// </summary>
         public int BaseStuNum { get; set; }
+
+        /// <summary>
+        /// 邮箱
+        /// </summary>
+        public string Email { get; set; }
+
+        /// <summary>
+        /// 基础课时费
+        /// </summary>
+        public decimal BaseHourFee { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/Course/RB_Class_Config_ViewModel.cs

+using Edu.Model.Entity.Course;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.Course
+{
+    /// <summary>
+    /// 班级基础配置视图实体类
+    /// </summary>
+    public class RB_Class_Config_ViewModel : RB_Class_Config
+    {
+
+    }
+}

Edu.Model/ViewModel/Course/RB_Class_Type_ViewModel.cs

+using Edu.Model.Entity.Course;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.Course
+{
+    /// <summary>
+    /// 班级类型费用设置视图实体类
+    /// </summary>
+    public class RB_Class_Type_ViewModel : RB_Class_Type
+    {
+    }
+}

Edu.Model/ViewModel/Course/RB_Teaching_BonusDetail_ViewModel.cs

+using System;
+using System.Collections.Generic;
+
+namespace Edu.Model.ViewModel.Course
+{
+    /// <summary>
+    /// 教师奖金明细实体类
+    /// </summary>
+    [Serializable]
+    public class RB_Teaching_BonusDetail_ViewModel : Entity.Course.RB_Teaching_BonusDetail
+    {
+        /// <summary>
+        /// 奖励ids
+        /// </summary>
+        public string BonusIds { get; set; }
+        /// <summary>
+        /// 教师名称
+        /// </summary>
+        public string TeacherName { get; set; }
+    }
+}
\ No newline at end of file

Edu.Model/ViewModel/Course/RB_Teaching_Bonus_ViewModel.cs

+using System;
+using System.Collections.Generic;
+
+namespace Edu.Model.ViewModel.Course
+{
+    /// <summary>
+    /// 教师奖金实体类
+    /// </summary>
+    [Serializable]
+    public class RB_Teaching_Bonus_ViewModel : Entity.Course.RB_Teaching_Bonus
+    {
+        /// <summary>
+        /// 教师id
+        /// </summary>
+        public int TeacherId { get; set; }
+
+        /// <summary>
+        /// 教师列表
+        /// </summary>
+        public List<RB_Teaching_BonusDetail_ViewModel> TeacherList { get; set; }
+    }
+}
\ No newline at end of file

Edu.Model/ViewModel/User/Employee_ViewModel.cs

@@ -156,5 +156,10 @@ namespace Edu.Model.ViewModel.User
         /// 行政备注
         /// </summary>
         public string AccountRemark { get; set; }
+
+        /// <summary>
+        /// 邮箱
+        /// </summary>
+        public string Email { get; set; }
     }
 }

Edu.Model/ViewModel/User/RB_Teacher_ViewModel.cs

@@ -75,7 +75,6 @@ namespace Edu.Model.ViewModel.User
         /// </summary>
         public string PostName { get; set; }
 
-        /// <summary>
         /// 教师编号
         /// </summary>
         public string QTIds { get; set; }

Edu.Module.Course/TeachingRewardsModule.cs

@@ -38,9 +38,21 @@ namespace Edu.Module.Course
         /// 用户日志
         /// </summary>
         private readonly RB_User_ChangeLogRepository changeLogRepository = new RB_User_ChangeLogRepository();
+        /// <summary>
+        /// 教师奖励
+        /// </summary>
+        private readonly RB_Teaching_BonusRepository teaching_BonusRepository = new RB_Teaching_BonusRepository();
+        /// <summary>
+        /// 教师奖励明细
+        /// </summary>
+        private readonly RB_Teaching_BonusDetailRepository teaching_BonusDetailRepository = new RB_Teaching_BonusDetailRepository();
+        /// <summary>
+        /// 教师
+        /// </summary>
+        private readonly RB_TeacherRepository teacherRepository = new RB_TeacherRepository();
 
 
-
+        #region 教务配置
         /// <summary>
         /// 获取教务奖励列表
         /// </summary>
@@ -249,5 +261,50 @@ namespace Edu.Module.Course
                 BasicHour = model?.BasicHour ?? 0
             };
         }
+        #endregion
+
+        #region 教师奖励
+
+        /// <summary>
+        /// 获取讲师奖励分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Teaching_Bonus_ViewModel> GetTeachingBonusPageList(int pageIndex, int pageSize, out long count, RB_Teaching_Bonus_ViewModel dmodel)
+        {
+            var list = teaching_BonusRepository.GetPageList(pageIndex, pageSize, out count, dmodel);
+            if (list.Any()) {
+                string bonusIds = string.Join(",", list.Select(x => x.Id));
+                //获取所有的明细
+                var dlist = teaching_BonusDetailRepository.GetList(new RB_Teaching_BonusDetail_ViewModel() { Group_Id = dmodel.Group_Id, BonusIds = bonusIds });
+                //获取所有的教师
+                string teacherIds = string.Join(",", list.Select(x => x.TeacherIds));
+                var tlist = teacherRepository.GetTeacherListRepository(new RB_Teacher_ViewModel() { Group_Id = dmodel.Group_Id, QTIds = teacherIds });
+
+                foreach (var item in list)
+                {
+                    item.TeacherList = new List<RB_Teaching_BonusDetail_ViewModel>();
+                    string[] teacherIdArr = item.TeacherIds.Split(",");
+                    foreach (var qitem in teacherIdArr) {
+                        int teacherId = Convert.ToInt32(qitem);
+                        string teacherName = tlist.Where(x => x.TId == teacherId).FirstOrDefault()?.TeacherName ?? "";
+                        //教师累计奖励金额
+                        decimal money = dlist.Where(x => x.BonusId == item.Id && x.TeacherId == teacherId).Sum(x => x.Money);
+                        item.TeacherList.Add(new RB_Teaching_BonusDetail_ViewModel()
+                        {
+                            TeacherId = teacherId,
+                            TeacherName = teacherName,
+                            Money = money
+                        });
+                    }
+                }
+            }
+            return list;
+        }
+
+        #endregion
     }
 }

Edu.Module.Public/ClassConfigModule.cs

+using Edu.Common.Enum;
+using Edu.Model.ViewModel.Course;
+using Edu.Repository.Course;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Module.Public
+{
+    /// <summary>
+    /// 基础配置相关
+    /// </summary>
+    public class ClassConfigModule
+    {
+        /// <summary>
+        /// 课程相关设置仓储层对象
+        /// </summary>
+        private readonly RB_Class_ConfigRepository class_ConfigRepository = new RB_Class_ConfigRepository();
+
+        /// <summary>
+        /// 班级类型仓储层对象
+        /// </summary>
+        private readonly RB_Class_TypeRepository class_TypeRepository = new RB_Class_TypeRepository();
+
+        #region  班级基础设置
+        /// <summary>
+        /// 获取班级配置实体类
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public RB_Class_Config_ViewModel GetClassConfigModule(RB_Class_Config_ViewModel query)
+        {
+            return class_ConfigRepository.GetClassConfigRepository(query);
+        }
+
+        /// <summary>
+        /// 添加修改班级基础设置
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public bool SetClassConfigModule(RB_Class_Config_ViewModel extModel)
+        {
+            var oldModel = GetClassConfigModule(extModel);
+            bool flag;
+            if (oldModel != null && oldModel.ConfigId > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Class_Config_ViewModel.BasicHourFee),extModel.BasicHourFee },
+                    {nameof(RB_Class_Config_ViewModel.BasicClassNum),extModel.BasicClassNum },
+                    {nameof(RB_Class_Config_ViewModel.BasicMinutes),extModel.BasicMinutes },
+                    {nameof(RB_Class_Config_ViewModel.UpdateBy),extModel.UpdateBy },
+                    {nameof(RB_Class_Config_ViewModel.UpdateTime),extModel.UpdateTime },
+                };
+                flag = class_ConfigRepository.Update(fileds, new WhereHelper(nameof(RB_Class_Config_ViewModel.ConfigId), oldModel.ConfigId));
+            }
+            else
+            {
+                var newId = class_ConfigRepository.Insert(extModel);
+                flag = newId > 0;
+                extModel.ConfigId = newId;
+            }
+            return flag;
+        }
+
+        #endregion
+
+        #region 班级类型设置
+
+        /// <summary>
+        /// 获取班级类型费用分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Class_Type_ViewModel> GetClassTypePageListModule(int pageIndex, int pageSize, out long rowsCount, RB_Class_Type_ViewModel query)
+        {
+            return class_TypeRepository.GetClassTypePageListRepository(pageIndex, pageSize, out rowsCount, query);
+        }
+
+        /// <summary>
+        /// 获取班级类型列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Class_Type_ViewModel> GetClassTypeListModule(RB_Class_Type_ViewModel query)
+        {
+            return class_TypeRepository.GetClassTypeListRepository(query);
+        }
+
+        /// <summary>
+        /// 新增修改班级类型
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public bool SetClassTypeModule(RB_Class_Type_ViewModel extModel)
+        {
+            bool flag;
+            if (extModel.CTypeId > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                   {nameof(RB_Class_Type_ViewModel.CTypeName),extModel.CTypeName},
+                   {nameof(RB_Class_Type_ViewModel.AddHourFee),extModel.AddHourFee},
+                   {nameof(RB_Class_Type_ViewModel.DefaultClassNum),extModel.DefaultClassNum},
+                   {nameof(RB_Class_Type_ViewModel.UpdateBy),extModel.UpdateBy},
+                   {nameof(RB_Class_Type_ViewModel.UpdateTime),extModel.UpdateTime},
+                };
+                flag = class_TypeRepository.Update(fileds, new WhereHelper(nameof(RB_Class_Type_ViewModel.CTypeId),extModel.CTypeId));
+            }
+            else
+            {
+                var newId = class_TypeRepository.Insert(extModel);
+                extModel.CTypeId = newId;
+                flag = newId > 0;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 获取班级类型实体类
+        /// </summary>
+        /// <param name="CTypeId"></param>
+        /// <returns></returns>
+        public RB_Class_Type_ViewModel GetClassTypeModule(object CTypeId)
+        {
+            return class_TypeRepository.GetEntity<RB_Class_Type_ViewModel>(CTypeId);
+        }
+
+        /// <summary>
+        /// 删除班级类型
+        /// </summary>
+        /// <param name="CTypeId"></param>
+        /// <returns></returns>
+        public bool RemoveClassTypeModule(int CTypeId)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+               {nameof(RB_Class_Type_ViewModel.Status),(int) DateStateEnum.Delete}
+            };
+            bool flag = class_TypeRepository.Update(fileds, new WhereHelper(nameof(RB_Class_Type_ViewModel.CTypeId), CTypeId));
+            return flag;
+        }
+        #endregion
+    }
+}

Edu.Module.User/AssistModule.cs

@@ -131,6 +131,7 @@ namespace Edu.Module.User
                     fileds.Add(nameof(RB_Assist.LeaveStatus),model.LeaveStatus);
                     fileds.Add(nameof(RB_Assist.LeaveTime),model.LeaveTime);
                     fileds.Add(nameof(RB_Assist.Education),model.Education);
+                    fileds.Add(nameof(RB_Assist.Email), model.Email);
                 }
                 string logContent = "";
                 if (model.AssistName != oldModel.AssistName)
@@ -181,6 +182,10 @@ namespace Edu.Module.User
                 {
                     logContent += string.Format(",将学历由【{0}】修改为【{1}】。", oldModel.Education.ToName(), model.Education.ToName());
                 }
+                if (model.Email != oldModel.Email)
+                {
+                    logContent += string.Format(",将邮箱由【{0}】修改为【{1}】。", oldModel.Email, model.Email);
+                }
                 if (!string.IsNullOrEmpty(logContent))
                 {
                     //新增日志

Edu.Module.User/EmployeeModule.cs

@@ -116,7 +116,6 @@ namespace Edu.Module.User
         public Employee_ViewModel GetEmployeeModule(int Id, int AccountId, int AccountType)
         {
             Employee_ViewModel model = new Employee_ViewModel();
-
             var list = accountRepository.GetEmployeeListRepository(new Employee_ViewModel() { Id = Id, AccountId = AccountId, AccountType = (Common.Enum.User.AccountTypeEnum)AccountType });
             if (list != null && list.Any())
             {
@@ -162,7 +161,8 @@ namespace Edu.Module.User
                         BirthDate = extModel.BirthDate,
                         LeaveStatus = extModel.LeaveStatus,
                         LeaveTime = extModel.LeaveTime,
-                        Education = extModel.Education
+                        Education = extModel.Education,
+                        Email=extModel.Email,
                     });
                     break;
                 case Common.Enum.User.AccountTypeEnum.Teacher:
@@ -189,6 +189,7 @@ namespace Edu.Module.User
                         LeaveStatus = extModel.LeaveStatus,
                         LeaveTime = extModel.LeaveTime,
                         Education = extModel.Education,
+                        Email=extModel.Email,
                     });
                     break;
                 case Common.Enum.User.AccountTypeEnum.Assist:
@@ -213,7 +214,8 @@ namespace Edu.Module.User
                         BirthDate = extModel.BirthDate,
                         LeaveStatus = extModel.LeaveStatus,
                         LeaveTime = extModel.LeaveTime,
-                        Education = extModel.Education
+                        Education = extModel.Education,
+                        Email=extModel.Email,
                     });
                     break;
             }

Edu.Module.User/ManagerModule.cs

@@ -78,8 +78,9 @@ namespace Edu.Module.User
                     { nameof(RB_Manager_ViewModel.Address),model.Address },
                     { nameof(RB_Manager_ViewModel.BirthDate),model.BirthDate },
                     { nameof(RB_Manager_ViewModel.LeaveStatus),model.LeaveStatus },
-                      { nameof(RB_Manager_ViewModel.LeaveTime),model.LeaveTime },
+                    { nameof(RB_Manager_ViewModel.LeaveTime),model.LeaveTime },
                     { nameof(RB_Manager_ViewModel.Education),model.Education },
+                    { nameof(RB_Manager_ViewModel.Email),model.Email },
                 };
                 string logContent = "";
                 if (model.MName != oldModel.MName)
@@ -142,6 +143,10 @@ namespace Edu.Module.User
                 {
                     logContent += string.Format(",将学历由【{0}】修改为【{1}】。", oldModel.Education.ToName(), model.Education.ToName());
                 }
+                if (model.Email != oldModel.Email)
+                {
+                    logContent += string.Format(",将邮箱由【{0}】修改为【{1}】。", oldModel.Email, model.Email);
+                }
                 if (!string.IsNullOrEmpty(logContent))
                 {
                     //新增日志

Edu.Module.User/TeacherModule.cs

@@ -122,6 +122,7 @@ namespace Edu.Module.User
                     fileds.Add(nameof(RB_Teacher_ViewModel.Dept_Id), model.Dept_Id);
                     fileds.Add(nameof(RB_Teacher_ViewModel.Post_Id), model.Post_Id);
                     fileds.Add(nameof(RB_Teacher_ViewModel.BaseStuNum), model.BaseStuNum);
+                    fileds.Add(nameof(RB_Teacher_ViewModel.BaseHourFee), model.BaseHourFee);
                 }
                 else
                 {
@@ -137,6 +138,7 @@ namespace Edu.Module.User
                     fileds.Add(nameof(RB_Teacher_ViewModel.LeaveStatus), model.LeaveStatus);
                     fileds.Add(nameof(RB_Teacher_ViewModel.LeaveTime), model.LeaveTime);
                     fileds.Add(nameof(RB_Teacher_ViewModel.Education), model.Education);
+                    fileds.Add(nameof(RB_Teacher_ViewModel.Email), model.Email);
                 }
                 string logContent = "";
                 if (model.TeacherName != oldModel.TeacherName)
@@ -183,6 +185,18 @@ namespace Edu.Module.User
                 {
                     logContent += string.Format(",将学历由【{0}】修改为【{1}】。", oldModel.Education.ToName(), model.Education.ToName());
                 }
+                if (model.Email != oldModel.Email)
+                {
+                    logContent += string.Format(",将邮箱由【{0}】修改为【{1}】。", oldModel.Email, model.Email);
+                }
+                if (model.BaseHourFee != oldModel.BaseHourFee)
+                {
+                    logContent += string.Format(",将基础课时费由【{0}】修改为【{1}】。", oldModel.BaseHourFee, model.BaseHourFee);
+                }
+                if (model.BaseStuNum != oldModel.BaseStuNum)
+                {
+                    logContent += string.Format(",将基础带班人数由【{0}】修改为【{1}】。", oldModel.BaseStuNum, model.BaseStuNum);
+                }
                 if (!string.IsNullOrEmpty(logContent))
                 {
                     //新增日志

Edu.Repository/Course/RB_ClassRepository.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;
@@ -190,6 +191,7 @@ WHERE 1=1
                 if (query.Q_CanApply == 1)
                 {
                     builder.AppendFormat(" AND (IFNULL(A.ClassPersion,0)-IFNULL(t.GuestNum,0))>0 ");
+                    builder.AppendFormat(" AND A.{0} >='{1}' ", nameof(RB_Class_ViewModel.EndOrderTime), DateTime.Now.ToString("yyyy-MM-dd"));
                 }
             }
             return GetPage<RB_Class_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();

Edu.Repository/Course/RB_Class_ConfigRepository.cs

+using Edu.Model.Entity.Course;
+using Edu.Model.ViewModel.Course;
+using System.Text;
+using System.Linq;
+
+namespace Edu.Repository.Course
+{
+    /// <summary>
+    /// 班级基础配置仓储层
+    /// </summary>
+    public class RB_Class_ConfigRepository : BaseRepository<RB_Class_Config>
+    {
+        /// <summary>
+        /// 获取班级基础配置实体
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public RB_Class_Config_ViewModel GetClassConfigRepository(RB_Class_Config_ViewModel query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(@"
+SELECT *
+FROM RB_Class_Config
+WHERE 1=1 
+");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(@" AND {0}={1} ", nameof(RB_Class_Config_ViewModel.Group_Id), query.Group_Id);
+                }
+                if (query.ConfigId > 0)
+                {
+                    builder.AppendFormat(@" AND {0}={1} ", nameof(RB_Class_Config_ViewModel.ConfigId), query.ConfigId);
+                }
+            }
+            return Get<RB_Class_Config_ViewModel>(builder.ToString()).FirstOrDefault();
+        }
+    }
+}

Edu.Repository/Course/RB_Class_TypeRepository.cs

+using Edu.Model.Entity.Course;
+using Edu.Model.ViewModel.Course;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Edu.Repository.Course
+{
+    /// <summary>
+    /// 班级类型费用设置仓储层
+    /// </summary>
+    public class RB_Class_TypeRepository : BaseRepository<RB_Class_Type>
+    {
+        /// <summary>
+        /// 获取班级类型费用分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Class_Type_ViewModel> GetClassTypePageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Class_Type_ViewModel query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_Class_Type
+WHERE 1=1 
+");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_Type_ViewModel.Group_Id), query.Group_Id);
+                }
+            }
+            return GetPage<RB_Class_Type_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 获取班级类型列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Class_Type_ViewModel> GetClassTypeListRepository(RB_Class_Type_ViewModel query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_Class_Type
+WHERE 1=1 
+");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_Type_ViewModel.Group_Id), query.Group_Id);
+                }
+            }
+            return Get<RB_Class_Type_ViewModel>(builder.ToString()).ToList();
+        }
+    }
+}
\ No newline at end of file

Edu.Repository/Course/RB_Teaching_BonusDetailRepository.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_Teaching_BonusDetailRepository : BaseRepository<RB_Teaching_BonusDetail>
+    {
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Teaching_BonusDetail_ViewModel> GetList(RB_Teaching_BonusDetail_ViewModel demodel)
+        {
+            string where = $@" 1=1 and Status=0";
+            
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and {nameof(RB_Teaching_BonusDetail.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.School_Id > 0)
+            {
+                where += $@" and {nameof(RB_Teaching_BonusDetail.School_Id)} ={demodel.School_Id}";
+            }
+            if (demodel.BonusId > 0)
+            {
+                where += $@" and {nameof(RB_Teaching_BonusDetail.BonusId)} ={demodel.BonusId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.BonusIds))
+            {
+                where += $@" and {nameof(RB_Teaching_BonusDetail.BonusId)} in({demodel.BonusIds})";
+            }
+            if (demodel.TeacherId > 0)
+            {
+                where += $@" and {nameof(RB_Teaching_BonusDetail.TeacherId)} ={demodel.TeacherId}";
+            }
+            if (demodel.ClassId > 0)
+            {
+                where += $@" and {nameof(RB_Teaching_BonusDetail.ClassId)} ={demodel.ClassId}";
+            }
+            if (demodel.Type > 0)
+            {
+                where += $@" and {nameof(RB_Teaching_BonusDetail.Type)} ={demodel.Type}";
+            }
+
+            string sql = $@" select * from RB_Teaching_BonusDetail where {where} order by Id desc";
+            return Get<RB_Teaching_BonusDetail_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_Teaching_BonusDetail_ViewModel> GetPageList(int pageIndex,int pageSize,out long count,RB_Teaching_BonusDetail_ViewModel demodel)
+        {
+            string where = $@" 1=1 and Status=0";
+
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and {nameof(RB_Teaching_BonusDetail.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.School_Id > 0)
+            {
+                where += $@" and {nameof(RB_Teaching_BonusDetail.School_Id)} ={demodel.School_Id}";
+            }
+            if (demodel.BonusId > 0)
+            {
+                where += $@" and {nameof(RB_Teaching_BonusDetail.BonusId)} ={demodel.BonusId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.BonusIds))
+            {
+                where += $@" and {nameof(RB_Teaching_BonusDetail.BonusId)} in({demodel.BonusIds})";
+            }
+            if (demodel.TeacherId > 0)
+            {
+                where += $@" and {nameof(RB_Teaching_BonusDetail.TeacherId)} ={demodel.TeacherId}";
+            }
+            if (demodel.ClassId > 0)
+            {
+                where += $@" and {nameof(RB_Teaching_BonusDetail.ClassId)} ={demodel.ClassId}";
+            }
+            if (demodel.Type > 0)
+            {
+                where += $@" and {nameof(RB_Teaching_BonusDetail.Type)} ={demodel.Type}";
+            }
+
+            string sql = $@" select * from RB_Teaching_BonusDetail where {where} order by Id desc";
+            return GetPage<RB_Teaching_BonusDetail_ViewModel>(pageIndex, pageSize, out count, sql).ToList();
+        }
+    }
+}

Edu.Repository/Course/RB_Teaching_BonusRepository.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_Teaching_BonusRepository : BaseRepository<RB_Teaching_Bonus>
+    {
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Teaching_Bonus_ViewModel> GetList(RB_Teaching_Bonus_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+            
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and {nameof(RB_Teaching_Bonus.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.School_Id > 0)
+            {
+                where += $@" and {nameof(RB_Teaching_Bonus.School_Id)} ={demodel.School_Id}";
+            }
+            if (!string.IsNullOrEmpty(demodel.Month))
+            {
+                where += $@" and {nameof(RB_Teaching_Bonus.Month)} ='{demodel.Month}'";
+            }
+            if (demodel.TeacherId > 0)
+            {
+                where += $@" and FIND_IN_SET('{demodel.TeacherId}',{nameof(RB_Teaching_Bonus.TeacherIds)})";
+            }
+            if (demodel.State > 0)
+            {
+                where += $@" and {nameof(RB_Teaching_Bonus.State)} ={(int)demodel.State}";
+            }
+
+            string sql = $@" select * from RB_Teaching_Bonus where {where} order by Id desc";
+            return Get<RB_Teaching_Bonus_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_Teaching_Bonus_ViewModel> GetPageList(int pageIndex,int pageSize,out long count,RB_Teaching_Bonus_ViewModel demodel)
+        {
+            string where = $@" 1=1";
+
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and {nameof(RB_Teaching_Bonus.Group_Id)} ={demodel.Group_Id}";
+            }
+            if (demodel.School_Id > 0)
+            {
+                where += $@" and {nameof(RB_Teaching_Bonus.School_Id)} ={demodel.School_Id}";
+            }
+            if (!string.IsNullOrEmpty(demodel.Month))
+            {
+                where += $@" and {nameof(RB_Teaching_Bonus.Month)} ='{demodel.Month}'";
+            }
+            if (demodel.TeacherId > 0)
+            {
+                where += $@" and FIND_IN_SET('{demodel.TeacherId}',{nameof(RB_Teaching_Bonus.TeacherIds)})";
+            }
+            if (demodel.State > 0)
+            {
+                where += $@" and {nameof(RB_Teaching_Bonus.State)} ={(int)demodel.State}";
+            }
+
+            string sql = $@" select * from RB_Teaching_Bonus where {where} order by Id desc";
+            return GetPage<RB_Teaching_Bonus_ViewModel>(pageIndex, pageSize, out count, sql).ToList();
+        }
+    }
+}

Edu.Repository/User/RB_AccountRepository.cs

@@ -294,7 +294,7 @@ FROM
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
 SELECT ar.AccountRemark,A.Id,A.Account,A.AccountId,A.Group_Id,A.School_Id,A.EmployeeName,A.UserIcon,A.IDCard,A.Sex,A.Education,A.EntryTime,A.Address,A.BirthDate
-      ,A.LeaveStatus,A.LeaveTime,A.EmployeeTel,A.AccountType
+      ,A.LeaveStatus,A.LeaveTime,A.EmployeeTel,A.AccountType,A.Email
       ,IFNULL(G.GroupName,'') AS GroupName,IFNULL(s.SName,'') AS SchoolName
       ,IFNULL(d.DeptId,0) AS Dept_Id,IFNULL(d.DeptName,'') AS DeptName,IFNULL(p.PostId,0) AS Post_Id, IFNULL(p.PostName,'') AS PostName
       ,(CASE  WHEN CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(BirthDate,'%m-%d')) >= DATE_FORMAT(now(),'%Y-%m-%d')  
@@ -303,24 +303,27 @@ SELECT ar.AccountRemark,A.Id,A.Account,A.AccountId,A.Group_Id,A.School_Id,A.Empl
         ELSE 0 END) IsBirth    
 FROM 
 (
-		SELECT A.Id,A.Account,A.`Password`, 1 as AccountType,B.MId as AccountId,
-A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,A.`Status`,A.AnnualLeaveDay,
-b.School_Id,IFNULL(B.MName,'') AS EmployeeName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
-               ,B.LeaveStatus,B.LeaveTime,B.MTel AS EmployeeTel
+		SELECT A.Id,A.Account,A.`Password`, 1 as AccountType,B.MId as AccountId
+               ,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,A.`Status`,A.AnnualLeaveDay
+               ,b.School_Id,IFNULL(B.MName,'') AS EmployeeName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard
+               ,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
+               ,B.LeaveStatus,B.LeaveTime,B.MTel AS EmployeeTel,IFNULL(B.Email,'') AS Email
 		FROM rb_manager AS B LEFT JOIN rb_account AS A  ON A.AccountId=B.MId AND A.AccountType=1
 		WHERE 1=1 {0} {1}
 		UNION ALL
-		SELECT A.Id,A.Account,A.`Password`, 2 as AccountType,B.TId as AccountId,
-A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,A.`Status`,A.AnnualLeaveDay,
-b.School_Id,IFNULL(B.TeacherName,'') AS EmployeeName,B.TeacherIcon AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
-               ,B.LeaveStatus,B.LeaveTime,B.TeacherTel AS EmployeeTel
+		SELECT A.Id,A.Account,A.`Password`, 2 as AccountType,B.TId as AccountId
+              ,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,A.`Status`,A.AnnualLeaveDay
+              ,b.School_Id,IFNULL(B.TeacherName,'') AS EmployeeName,B.TeacherIcon AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard
+              ,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
+              ,B.LeaveStatus,B.LeaveTime,B.TeacherTel AS EmployeeTel,IFNULL(B.Email,'') AS Email
 		FROM rb_teacher AS B LEFT JOIN rb_account AS A  ON A.AccountId=B.TId AND A.AccountType=2
 		WHERE 1=1 {0} {2}
 		UNION ALL
-		SELECT A.Id,A.Account,A.`Password`, 3 as AccountType,B.AId as AccountId,
-A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,A.`Status`,A.AnnualLeaveDay,
-b.School_Id,IFNULL(B.AssistName,'') AS EmployeeName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
-               ,B.LeaveStatus,B.LeaveTime,B.AssistTel AS EmployeeTel
+		SELECT A.Id,A.Account,A.`Password`, 3 as AccountType,B.AId as AccountId
+              ,A.CreateBy,A.CreateTime,A.UpdateBy,A.UpdateTime,A.Group_Id,A.`Status`,A.AnnualLeaveDay
+              ,b.School_Id,IFNULL(B.AssistName,'') AS EmployeeName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard
+              ,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
+              ,B.LeaveStatus,B.LeaveTime,B.AssistTel AS EmployeeTel,IFNULL(B.Email,'') AS Email
 		FROM  rb_assist AS B LEFT JOIN rb_account AS A  ON A.AccountId=B.AId AND A.AccountType=3
 		WHERE 1=1 {0} {3}
 ) AS A LEFT JOIN rb_group AS g ON A.Group_Id=g.GId

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -349,7 +349,7 @@ namespace Edu.WebApi.Controllers.Course
             JObject prams = JObject.Parse(RequestParm.Msg.ToString());
             int OrderId = prams.GetInt("OrderId", 0);
             if (OrderId <= 0) {
-                return ApiResult.ParamIsNull();
+                return ApiResult.ParamIsNull("订单号不存在");
             }
 
             bool flag = orderModule.CancelClassOrder(OrderId, userInfo);

Edu.WebApi/Controllers/Course/TeachingRewardsController.cs

@@ -194,5 +194,45 @@ namespace Edu.WebApi.Controllers.Course
         }
 
         #endregion
+
+        #region 教师奖励
+
+        /// <summary>
+        /// 教师奖励分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetTeachingBonusPageList()
+        {
+            var userInfo = base.UserInfo;
+            var pageModel = JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
+            var dmodel = JsonHelper.DeserializeObject<RB_Teaching_Bonus_ViewModel>(RequestParm.Msg.ToString());
+            dmodel.Group_Id = userInfo.Group_Id;
+
+            var list = teachingRewardsModule.GetTeachingBonusPageList(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
+            pageModel.Count = Convert.ToInt32(count);
+            pageModel.PageData = list.Select(x => new
+            {
+                x.Id,
+                x.Month,
+                x.Money,
+                x.FinanceId,
+                x.State,
+                StateName = x.State.ToName(),
+                x.UpdateBy,
+                UpdateByName = UserReidsCache.GetUserLoginInfo(x.UpdateBy)?.AccountName ?? "",
+                UpdateTime = x.UpdateTime.ToString("yyyy-MM-dd HH:mm:ss"),
+                TeacherList = x.TeacherList.Select(z => new
+                {
+                    z.TeacherId,
+                    z.TeacherName,
+                    z.Money
+                })
+            });
+
+            return ApiResult.Success("", pageModel);
+        }
+
+        #endregion
     }
 }

Edu.WebApi/Controllers/Public/PublicController.cs

@@ -5,6 +5,7 @@ using Edu.Cache.User;
 using Edu.Common.API;
 using Edu.Common.Plugin;
 using Edu.Model.Public;
+using Edu.Model.ViewModel.Course;
 using Edu.Model.ViewModel.System;
 using Edu.Module.Public;
 using Edu.Module.System;
@@ -43,6 +44,11 @@ namespace Edu.WebApi.Controllers.Public
         /// </summary>
         private readonly PublicModule publicModule = new PublicModule();
 
+        /// <summary>
+        /// 班级基础设置处理类对象
+        /// </summary>
+        private readonly ClassConfigModule classConfigModule = new ClassConfigModule();
+
         #region 省市区
 
         /// <summary>
@@ -287,7 +293,6 @@ namespace Edu.WebApi.Controllers.Public
         }
         #endregion
 
-
         #region 上传设置
         public ApiResult GetFileStoreList()
         {
@@ -400,7 +405,7 @@ namespace Edu.WebApi.Controllers.Public
 
         #endregion
 
-
+        #region 角色权限
         /// <summary>
         /// 获取角色权限
         /// </summary>
@@ -426,5 +431,114 @@ namespace Edu.WebApi.Controllers.Public
             bool flag = roleModule.SetRolePermissionModule(rolePermissionList, roleFunctionList);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
+
+        #endregion
+
+        #region 班级设置
+        /// <summary>
+        /// 获取班级基础设置
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetClassConfig()
+        {
+            var query = new RB_Class_Config_ViewModel()
+            {
+                 Group_Id=base.UserInfo.Group_Id,
+                 ConfigId=base.ParmJObj.GetInt("ConfigId")
+            };
+            var extModel = classConfigModule.GetClassConfigModule(query);
+            return ApiResult.Success(data: extModel);
+        }
+
+        /// <summary>
+        /// 新增修改班级基础设置
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetClassConfig()
+        {
+            var extModel = new RB_Class_Config_ViewModel()
+            {
+                ConfigId = base.ParmJObj.GetInt("ConfigId"),
+                BasicHourFee=base.ParmJObj.GetDecimal("BasicHourFee"),
+                BasicClassNum=base.ParmJObj.GetInt("BasicClassNum"),
+                BasicMinutes=base.ParmJObj.GetInt("BasicMinutes"),
+            };
+            extModel.Group_Id = base.UserInfo.Group_Id;
+            extModel.UpdateBy = base.UserInfo.Id;
+            extModel.UpdateTime = DateTime.Now;
+            var flag = classConfigModule.SetClassConfigModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 获取班级类型费用分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetClassTypePageList()
+        {
+            var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
+            var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Class_Type_ViewModel>(RequestParm.Msg.ToString());
+            var list = classConfigModule.GetClassTypePageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
+            pageModel.Count = rowsCount;
+            pageModel.PageData = list;
+            return ApiResult.Success(data: pageModel);
+        }
+
+        /// <summary>
+        /// 获取班级类型列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetClassTypeList()
+        {
+            var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Class_Type_ViewModel>(RequestParm.Msg.ToString());
+            var list = classConfigModule.GetClassTypeListModule(query);
+            return ApiResult.Success(data: list);
+        }
+
+        /// <summary>
+        /// 添加修改班级费用类型
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetClassType()
+        {
+            var extModel = Common.Plugin.JsonHelper.DeserializeObject<RB_Class_Type_ViewModel>(RequestParm.Msg.ToString());
+            extModel.CreateTime = DateTime.Now;
+            extModel.Group_Id = base.UserInfo.Group_Id;
+            extModel.CreateBy = base.UserInfo.Id;
+            extModel.UpdateBy = base.UserInfo.Id;
+            extModel.UpdateTime = DateTime.Now;
+            bool flag = classConfigModule.SetClassTypeModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 根据编号获取班级费用类型实体
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetClassTypeModule()
+        {
+            var CTypeId = base.ParmJObj.GetInt("CTypeId", 0);
+            var extModel = classConfigModule.GetClassTypeModule(CTypeId);
+            return ApiResult.Success(data: extModel);
+        }
+
+        /// <summary>
+        /// 修改班级费用类型状态
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult RemoveClassType()
+        {
+            var CTypeId = base.ParmJObj.GetInt("CTypeId", 0);
+            var flag = classConfigModule.RemoveClassTypeModule(CTypeId);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+        #endregion 
     }
 }
\ No newline at end of file

Edu.WebApi/Controllers/User/UserController.cs

@@ -355,6 +355,7 @@ namespace Edu.WebApi.Controllers.User
                 Dept_Id = base.ParmJObj.GetInt("Dept_Id"),
                 Post_Id = base.ParmJObj.GetInt("Post_Id"),
                 BaseStuNum = base.ParmJObj.GetInt("BaseStuNum"),
+                BaseHourFee=base.ParmJObj.GetDecimal("BaseHourFee"),
             };
             extModel.TeachTag = base.ParmJObj.GetStringValue("TeachTag");
             extModel.CreateBy = base.UserInfo.Id;
@@ -689,7 +690,8 @@ namespace Edu.WebApi.Controllers.User
                 qitem.School_Id,
                 qitem.Group_Id,
                 qitem.Dept_Id,
-                qitem.AccountRemark
+                qitem.AccountRemark,
+                qitem.Email,
             });
             return ApiResult.Success(data: pageModel);
         }
@@ -733,6 +735,7 @@ namespace Edu.WebApi.Controllers.User
                  LeaveTime=base.ParmJObj.GetDateTime("LeaveTime"),
                  Education=(EducationEnum)base.ParmJObj.GetInt("Education"),
                  School_Id=base.ParmJObj.GetInt("School_Id"),
+                 Email=base.ParmJObj.GetStringValue("Email"),
             };
             extModel.CreateBy = base.UserInfo.Id;
             extModel.CreateTime = DateTime.Now;
@@ -751,8 +754,6 @@ namespace Edu.WebApi.Controllers.User
         }
 
 
-
-
         /// <summary>
         /// 修改员工的部门
         /// </summary>
@@ -761,7 +762,6 @@ namespace Edu.WebApi.Controllers.User
         public ApiResult UpdateEmployeeDept()
         {
             var extModel = Common.Plugin.JsonHelper.DeserializeObject<Employee_ViewModel>(RequestParm.Msg.ToString());
-
             extModel.UpdateBy = base.UserInfo.Id;
             extModel.UpdateTime = DateTime.Now;
             extModel.Group_Id = base.UserInfo.Group_Id;
@@ -780,7 +780,6 @@ namespace Edu.WebApi.Controllers.User
         public ApiResult UpdateEmployeePost()
         {
             var extModel = Common.Plugin.JsonHelper.DeserializeObject<Employee_ViewModel>(RequestParm.Msg.ToString());
-
             extModel.UpdateBy = base.UserInfo.Id;
             extModel.UpdateTime = DateTime.Now;
             extModel.Group_Id = base.UserInfo.Group_Id;
@@ -903,6 +902,7 @@ namespace Edu.WebApi.Controllers.User
                 SexStr = (extModel?.Sex ?? 0) == 0 ? "男" : "女",
                 UserIcon = extModel?.UserIcon ?? "",
                 Status = extModel?.Status ?? 0,
+                Email=extModel?.Email??"",
             };
             return ApiResult.Success(data: obj);
         }