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

Edu.Common/Config.cs

@@ -550,5 +550,63 @@ namespace Edu.Common
             }
         }
 
+
+        /// <summary>
+        /// 甲鹤教育接口请求地址
+        /// </summary>
+        public static string DmcMallApi
+        {
+            get
+            {
+                return ReadConfigKey("DmcMallApi");
+            }
+        }
+
+
+        /// <summary>
+        /// 甲鹤教育商户id
+        /// </summary>
+        public static string JHTenantId
+        {
+            get
+            {
+                return ReadConfigKey("JHTenantId");
+            }
+        }
+
+
+        /// <summary>
+        /// 甲鹤教育小程序id
+        /// </summary>
+        public static string JHMallBaseId
+        {
+            get
+            {
+                return ReadConfigKey("JHMallBaseId");
+            }
+        }
+
+        /// <summary>
+        /// 电商加密
+        /// </summary>
+        public static string MallJwtSecretKey
+        {
+            get
+            {
+                return ReadConfigKey("MallJwtSecretKey");
+            }
+        }
+
+        /// <summary>
+        /// 值班日期验证
+        /// </summary>
+        public static DateTime DutyDate
+        {
+            get
+            {
+                DateTime.TryParse(ReadConfigKey("DutyDate"), out DateTime dt);
+                return dt;
+            }
+        }
     }
 }
\ No newline at end of file

Edu.Common/Enum/ApiRequestFromEnum.cs

@@ -38,6 +38,13 @@ namespace Edu.Common.Enum
         [EnumField("ERP")]
         ERP =6,
 
+        /// <summary>
+        /// Mall【生成Token使用】
+        /// </summary>
+        [EnumField("Mall")]
+        Mall = 7,
+
+
         /// <summary>
         /// App学生端
         /// </summary>

Edu.Common/Enum/Course/FinanceConfigTypeEnum.cs

@@ -52,6 +52,18 @@ namespace Edu.Common.Enum.Course
         /// 学费收入
         /// </summary>
         [EnumField("学费收入")]
-        Tuition = 8
+        Tuition = 8,
+        /// <summary>
+        /// 活动收入（电商）
+        /// </summary>
+        [EnumField("活动收入")]
+        ActivityIncome = 9,
+
+        /// <summary>
+        /// 活动退款（电商）
+        /// </summary>
+        [EnumField("活动退款")]
+        ActivityExpenditure = 10,
+
     }
 }

Edu.Common/Enum/System/PushMessageCategoryEnum.cs

@@ -45,5 +45,11 @@ namespace Edu.Common.Enum.System
         /// </summary>
         [EnumField("财务单据审核")]
         Finance = 6,
+
+        /// <summary>
+        /// 试听课
+        /// </summary>
+        [EnumField("试听课")]
+        ReserveClass = 7,
     }
 }

Edu.Common/Enum/User/SpecialtyEnum.cs

+using Edu.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Common.Enum.User
+{
+    /// <summary>
+    /// 教师擅长枚举
+    /// </summary>
+    public enum SpecialtyEnum
+    {
+        /// <summary>
+        /// 少儿类：主要以丰富可与时间和兴趣为主，要求课堂轻松活跃。趣味性十足
+        /// </summary>
+        [EnumField("少儿类")]
+        Children = 1,
+
+        /// <summary>
+        /// 兴趣类：成年人，对日语学习从兴趣开始，要求课堂丰富有趣
+        /// </summary>
+        [EnumField("兴趣类")]
+        Interest = 2,
+
+        /// <summary>
+        /// 实用类：对于日语学习有一定的需求（考研、就业等），要求学习过程专业，干货多
+        /// </summary>
+        [EnumField("实用类")]
+        Practical = 3,
+
+        /// <summary>
+        /// 留学类：打算去往日本留学（本科、硕士、语言学校、私塾等）
+        /// </summary>
+        [EnumField("留学类")]
+        StudyAbroad = 4
+    }
+}

Edu.Common/GlobalKey.cs

@@ -24,6 +24,12 @@
         /// ERP用户TokenKey
         /// </summary>
         public const string JWT_ERP_User_Key = "userInfo";
+
+
+        /// <summary>
+        /// Mall用户TokenKey
+        /// </summary>
+        public const string JWT_Mall_User_Key = "userInfo";
         /// <summary>
         /// app学生用户TokenKey
         /// </summary>

Edu.Model/CacheModel/UserInfo.cs

@@ -67,6 +67,22 @@ namespace Edu.Model.CacheModel
         /// </summary>
         public string ErpToken { get; set; }
 
+        /// <summary>
+        /// 电商-token
+        /// </summary>
+        public string MallToken { get; set; }
+
+        /// <summary>
+        /// 电商-JHTenantId
+        /// </summary>
+        public string JHTenantId { get; set; }
+
+        /// <summary>
+        /// 电商-JHMallBaseId
+        /// </summary>
+        public string JHMallBaseId { get; set; }
+
+
         /// <summary>
         /// 菜单列表
         /// </summary>

Edu.Model/Entity/Advertising/Rb_Advertising.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Advertising
+{
+
+    /// <summary>
+    /// 广告基础信息
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Advertising
+    {
+
+        /// <summary>
+        /// 编号
+        /// </summary>        
+        public int ID
+        {
+            get;
+            set;
+        }
+
+
+
+        /// <summary>
+        /// 图片路径
+        /// </summary>        
+
+        public string PictureUrl
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 示例图片
+        /// </summary>  
+
+        public string SamplePicturesUrl
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 状态
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 名称
+        /// </summary>      
+
+        public string Title
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 标签
+        /// </summary>
+        public string Lable { get; set; }
+        /// <summary>
+		/// 集团编号
+		/// </summary>
+		public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 学校编号
+        /// </summary>
+       // public int School_Id { get; set; }
+
+        /// <summary>
+        /// 收费金额
+        /// </summary>        
+        public decimal? ChargeAmount
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否收费 1收2不收
+        /// </summary>     
+
+        public int? IsFee
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreateDate { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int? CreateBy { get; set; }
+    }
+}

Edu.Model/Entity/Advertising/Rb_Advertising_Make.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Advertising
+{
+    /// <summary>
+    /// 广告制作
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Advertising_Make
+    {
+
+        /// <summary>
+        /// 编号
+        /// </summary>        
+        public int ID
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 操作时间
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+		/// 集团编号
+		/// </summary>
+		public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 学校编号
+        /// </summary>
+        public int School_Id { get; set; }
+        /// <summary>
+        /// 状态
+        /// </summary>        
+        public Common.Enum.DateStateEnum? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 操作人
+        /// </summary>        
+        public int? UpdateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 关联广告id
+        /// </summary>        
+        public int? AdvertisingID
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 内容
+        /// </summary>        
+        public string Content
+        {
+            get;
+            set;
+        }
+
+
+        /// <summary>
+        /// 广告图片路径
+        /// </summary>
+        public string AdvertisingPicUrl { get; set; }
+
+        /// <summary>
+        /// 文件MD5
+        /// </summary>
+        public string SecretKey { get; set; }
+
+    }
+}

Edu.Model/Entity/Course/RB_Class.cs

@@ -198,5 +198,21 @@ namespace Edu.Model.Entity.Course
 		/// 上课人数
 		/// </summary>
 		public StudentNumTypeEnum? StudentNumType { get; set; }
-	}
+
+		/// <summary>
+		/// 课时分钟数
+		/// </summary>
+		public int ClassHourMinute { get; set; }
+
+        /// <summary>
+        /// 班级编号
+        /// </summary>
+        public string ClassNo { get; set; }
+
+        /// <summary>
+        /// 班级编号 - 字母排序
+        /// </summary>
+        public int ClassLetterNum { get; set; }
+
+    }
 }

Edu.Model/Entity/Course/RB_Class_Time.cs

@@ -69,7 +69,5 @@ namespace Edu.Model.Entity.Course
         /// 课堂视频
         /// </summary>
         public string VideoUrl { get; set; }
-
-
     }
 }

Edu.Model/Entity/Course/RB_Class_Type.cs

@@ -62,5 +62,11 @@ namespace Edu.Model.Entity.Course
 		/// 删除状态
 		/// </summary>
 		public DateStateEnum Status { get; set; }
-	}
+
+        /// <summary>
+        /// 班级编码前缀
+        /// </summary>
+        public string ClassNoPrefix { get; set; }
+
+    }
 }

Edu.Model/Entity/Course/RB_Order.cs

@@ -225,6 +225,16 @@ namespace Edu.Model.Entity.Course
         /// </summary>
         public decimal CommissionRate { get; set; }
 
+        /// <summary>
+        /// 销售返佣类型  0百分比   1固定值 （同行）
+        /// </summary>
+        public decimal CommissionTypeTH { get; set; }
+
+        /// <summary>
+        /// 提成比例/固定值 （同行）
+        /// </summary>
+        public decimal CommissionRateTH { get; set; }
+
         /// <summary>
         /// 提成补交
         /// </summary>
@@ -258,5 +268,10 @@ namespace Edu.Model.Entity.Course
         /// 前置订单编号
         /// </summary>
         public int UpOrderId { get; set; }
+
+        /// <summary>
+        /// 预约单号
+        /// </summary>
+        public int VisitorReserveId { get; set; }
     }
 }

Edu.Model/Entity/Course/RB_Sell_Commission_Details.cs

@@ -159,5 +159,10 @@ namespace Edu.Model.Entity.Course
         /// </summary>
         public decimal DeductionExtraMoney { get; set; }
 
+        /// <summary>
+        /// 确认状态  2021-06-30 Add By:W  0-未确认，1-已确认
+        /// </summary>
+        public int SureStatus { get; set; }
+
     }
 }

Edu.Model/Entity/Course/RB_Student_Makeup.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_Student_Makeup
+    {
+		/// <summary>
+		/// 主键
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 学员编号
+		/// </summary>
+		public int OrderGuestId { get; set; }
+
+		/// <summary>
+		/// 班级编号
+		/// </summary>
+		public int ClassId { get; set; }
+
+		/// <summary>
+		/// 上课日期
+		/// </summary>
+		public DateTime ClassDate { get; set; }
+
+		/// <summary>
+		/// 补课状态(1-正常，2-已处理，3-未处理)
+		/// </summary>
+		public int MakeUpStatus { get; set; }
+
+		/// <summary>
+		/// 签到编号
+		/// </summary>
+		public int ClassCheckId { get; set; }
+
+		/// <summary>
+		/// 创建人
+		/// </summary>
+		public int CreateBy { get; set; }
+
+		/// <summary>
+		/// 创建时间
+		/// </summary>
+		public DateTime CreateTime { get; set; }
+
+		/// <summary>
+		/// 集团编号
+		/// </summary>
+		public int Group_Id { get; set; }
+
+		/// <summary>
+		/// 处理人
+		/// </summary>
+		public int DealBy { get; set; }
+
+		/// <summary>
+		/// 处理时间
+		/// </summary>
+		public DateTime DealTime { get; set; }
+	}
+}

Edu.Model/Entity/Course/RB_Teaching_BonusDetail.cs

@@ -102,5 +102,10 @@ namespace Edu.Model.Entity.Course
         /// 抵基础课时
         /// </summary>
         public int DeductionHour { get; set; }
+
+        /// <summary>
+        /// 提成确认状态0-未确认，1-已确认
+        /// </summary>
+        public int SureStatus { get; set; }
     }
 }

Edu.Model/Entity/Duty/RB_Duty_Content.cs

@@ -95,5 +95,10 @@ namespace Edu.Model.Entity.Duty
 		/// 事项类型(1-选择，2-手动填写)
 		/// </summary>
 		public int ItemType { get; set; }
+
+		/// <summary>
+		/// 交接班次(rb_duty_plandetails表的Id)
+		/// </summary>
+		public string HandoverDlandetails { get; set; }
 	}
 }

Edu.Model/Entity/Duty/RB_Duty_Item.cs

@@ -70,5 +70,15 @@ namespace Edu.Model.Entity.Duty
         /// 值班标准图片
         /// </summary>
         public string ItemImg { get; set; }
+
+        /// <summary>
+        /// 值班事项分类(1-工作清单，2-突发事项，3-交接说明)
+        /// </summary>
+        public int DutyCategory { get; set; }
+
+        /// <summary>
+        /// 值班类型(1-规则事项，2-值班事项)
+        /// </summary>
+        public int DutyType { get; set; }
     }
 }

Edu.Model/Entity/Reserve/RB_Reserve_Class.cs

@@ -76,5 +76,9 @@ namespace Edu.Model.Entity.Reserve
 		/// </summary>
 		public DateStateEnum Status { get; set; }
 
+		/// <summary>
+		/// 结束时间
+		/// </summary>
+		public string EndTime { get; set; }
 	}
 }

Edu.Model/Entity/Reserve/RB_Visitor_Reserve.cs

@@ -22,7 +22,7 @@ namespace Edu.Model.Entity.Reserve
 		public int Visitor_Id { get; set; }
 
 		/// <summary>
-		/// 预约状态(0-跟进中,1-成交，2-流单）
+		/// 预约状态(0-跟进中,1-成交，2-流单,3-取消）
 		/// </summary>
 		public int ReserveStatus { get; set; }
 

Edu.Model/Entity/User/RB_Teacher.cs

@@ -187,5 +187,10 @@ namespace Edu.Model.Entity.User
         /// 国籍图片
         /// </summary>
         public string ForeignersUrl { get; set; }
+
+        /// <summary>
+        /// 老师特长
+        /// </summary>
+        public string Specialty { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/Advertising/Rb_Advertising_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Edu.Model.Entity.Advertising;
+
+namespace Edu.Model.ViewModel.Advertising
+{
+    public class Rb_Advertising_Extend : Rb_Advertising
+    {
+        /// <summary>
+        /// 标签
+        /// </summary>
+        public List<string> LableList { get; set; }
+
+        /// <summary>
+        /// 广告数量
+        /// </summary>
+        public int AdvertisingCount { get; set; }
+    }
+}

Edu.Model/ViewModel/Advertising/Rb_Advertising_Make_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Edu.Model.Entity.Advertising;
+
+namespace Edu.Model.ViewModel.Advertising
+{
+  public  class Rb_Advertising_Make_Extend: Rb_Advertising_Make
+    {
+        /// <summary>
+        /// 基础广告名称
+        /// </summary>
+        public string Title { get; set; }
+
+      
+        /// <summary>
+        /// 图片路径
+        /// </summary>        
+        public string PictureUrl
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 示例图片
+        /// </summary>        
+        public string SamplePicturesUrl
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 收费金额
+        /// </summary>        
+        public decimal? ChargeAmount
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否收费
+        /// </summary>        
+        public int? IsFee
+        {
+            get;
+            set;
+        }
+       
+    }
+}

Edu.Model/ViewModel/Course/GuestFinishMinute_ViewModel.cs

@@ -23,5 +23,10 @@ namespace Edu.Model.ViewModel.Course
         /// 完成分钟数
         /// </summary>
         public decimal FinishMinutes { get; set; }
+
+        /// <summary>
+        /// 完成课时数
+        /// </summary>
+        public decimal FinishClassHours { get; set; }
     }
 }

Edu.Model/ViewModel/Course/RB_Class_Check_ViewModel.cs

@@ -53,6 +53,11 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public int CheckNum { get; set; }
 
+        /// <summary>
+        /// 合同课时单价
+        /// </summary>
+        public decimal UnitPrice { get; set; }
+
         /// <summary>
         /// 订单id
         /// </summary>
@@ -92,11 +97,51 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string ClassName { get; set; }
 
+        /// <summary>
+        /// 班级编号
+        /// </summary>
+        public string ClassNo { get; set; }
+
+        /// <summary>
+        /// 班级类型
+        /// </summary>
+        public int ClassType { get; set; }
+
+        /// <summary>
+        /// 课程id
+        /// </summary>
+        public int CouseId { get; set; }
+
         /// <summary>
         /// 课程名称
         /// </summary>
         public string CourseName { get; set; }
 
+        /// <summary>
+        /// 教师增加课时费
+        /// </summary>
+        public decimal BaseHourFee { get; set; }
+
+        /// <summary>
+        /// 班级课时分钟数
+        /// </summary>
+        public int ClassHourMinute { get; set; }
+
+        /// <summary>
+        /// 合同编号
+        /// </summary>
+        public string ContractNo { get; set; }
+
+        /// <summary>
+        /// 业务人员
+        /// </summary>
+        public int EnterID { get; set; }
+
+        /// <summary>
+        /// 相关老师
+        /// </summary>
+        public int HelpEnterId { get; set; }
+
         /// <summary>
         /// 教室名称
         /// </summary>

Edu.Model/ViewModel/Course/RB_Class_Plan_ViewModel.cs

@@ -53,6 +53,11 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public int ClassType { get; set; }
 
+        /// <summary>
+        /// 班级课时分钟数
+        /// </summary>
+        public int ClassHourMinute { get; set; }
+
         /// <summary>
         /// 老师头像
         /// </summary>

Edu.Model/ViewModel/Course/RB_Class_ViewModel.cs

@@ -34,6 +34,11 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string CourseName { get; set; }
 
+        /// <summary>
+        /// 课程特色
+        /// </summary>
+        public string CourseFeature { get; set; }
+
         /// <summary>
         /// 课程分类
         /// </summary>
@@ -192,6 +197,25 @@ namespace Edu.Model.ViewModel.Course
         /// 关联其他课程列表
         /// </summary>
         public List<RB_Class_Course_Extend> OtherCourseList { get; set; }
+
+        /// <summary>
+        /// 班级状态字符串
+        /// </summary>
+        public string ClassStatusStr
+        {
+            get
+            {
+                string str = "";
+                str = Common.Plugin.EnumHelper.ToName(this.ClassStatus);
+                return str;
+            }
+        }
+
+        /// <summary>
+        /// 查询有未报满的班级
+        /// </summary>
+        public int IsQuerySurplus { get; set; }
+
     }
 
     /// <summary>

Edu.Model/ViewModel/Course/RB_Education_Contract_ViewModel.cs

@@ -30,11 +30,41 @@ namespace Edu.Model.ViewModel.Course
 
         #region 统计相关
 
+        /// <summary>
+        /// 下单开始时间
+        /// </summary>
+        public string StartTime { get; set; }
+
+        /// <summary>
+        /// 下单结束时间
+        /// </summary>
+        public string EndTime { get; set; }
+
+        /// <summary>
+        /// 消费课时开始时间
+        /// </summary>
+        public string XFStartTime { get; set; }
+
+        /// <summary>
+        /// 消费课时结束时间
+        /// </summary>
+        public string XFEndTime { get; set; }
+
+        /// <summary>
+        /// 业务员id
+        /// </summary>
+        public int SaleId { get; set; }
+
         /// <summary>
         /// 班级名称
         /// </summary>
         public string ClassName { get; set; }
 
+        /// <summary>
+        /// 班级编号
+        /// </summary>
+        public string ClassNo { get; set; }
+
         /// <summary>
         /// 调整金额
         /// </summary>

Edu.Model/ViewModel/Course/RB_Order_Guest_ViewModel.cs

@@ -20,6 +20,11 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string ClassIds { get; set; }
 
+        /// <summary>
+        /// 业务员id
+        /// </summary>
+        public int EnterID { get; set; }
+
         /// <summary>
         /// rb_student表的id
         /// </summary>
@@ -83,7 +88,7 @@ namespace Edu.Model.ViewModel.Course
             get; set;
         }
 
-      
+
 
         /// <summary>
         /// 课程编号

Edu.Model/ViewModel/Course/RB_Order_ViewModel.cs

@@ -49,6 +49,11 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public string GuestName { get; set; }
 
+        /// <summary>
+        /// 业务员名称
+        /// </summary>
+        public string EnterName { get; set; }
+
         /// <summary>
         /// 订单查询状态  1正常  2取消
         /// </summary>
@@ -122,6 +127,16 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public int CancelNum { get; set; }
 
+        /// <summary>
+        /// 结课数量
+        /// </summary>
+        public int JKNum { get; set; }
+
+        /// <summary>
+        /// 已上课金额(学生)
+        /// </summary>
+        public decimal YSKMoney { get; set; }
+
         /// <summary>
         /// 留学就业产品名称
         /// </summary>

Edu.Model/ViewModel/Course/RB_Sell_Commission_Details_ViewModel.cs

@@ -41,5 +41,21 @@ namespace Edu.Model.ViewModel.Course
         /// 是否需抵扣  1是
         /// </summary>
         public int IsDeduction { get; set; }
+
+        /// <summary>
+        /// 查询开始时间（个人中心-我的提成）
+        /// </summary>
+        public string StartTime { get; set; }
+
+
+        /// <summary>
+        /// 期数
+        /// </summary>
+        public string PeriodsTime { get; set; }
+
+        /// <summary>
+        /// 总提成数
+        /// </summary>
+        public decimal TotalMoney { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/Course/RB_Student_Makeup_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_Student_Makeup_ViewModel: RB_Student_Makeup
+    {
+        /// <summary>
+        /// 学员状态
+        /// </summary>
+        public int GuestState { get; set; }
+
+        /// <summary>
+        /// 处理状态字符串
+        /// </summary>
+        public string MakeUpStatusStr
+        {
+            get
+            {
+                string str = "";
+                switch (this.MakeUpStatus)
+                {
+                    case 1: str = "正常"; break;
+                    case 2: str = "已处理"; break;
+                    case 3: str = "未处理"; break;
+
+                }
+                return str;
+            }
+        }
+
+        /// <summary>
+        /// 学员状态
+        /// </summary>
+        public string GuestStateStr
+        {
+            get
+            {
+                string str = "";
+                switch (this.GuestState)
+                {
+                    case 1: str = "正常"; break;
+                    case 2: str = "退学"; break;
+                    case 3: str = "申请退学中"; break;
+                    case 4: str = "驳回申请"; break;
+                    case 5: str = "停课"; break;
+                }
+                return str;
+            }
+        }
+
+        /// <summary>
+        /// 学员姓名
+        /// </summary>
+        public string GuestName { get; set; }
+
+        /// <summary>
+        /// 班级名称
+        /// </summary>
+        public string ClassName { get; set; }
+
+        /// <summary>
+        /// 课程名称
+        /// </summary>
+        public string CourseName { get; set; }
+
+        /// <summary>
+        /// 教师名称
+        /// </summary>
+        public string TeacherName { get; set; }
+
+        /// <summary>
+        /// 教室名称
+        /// </summary>
+        public string RoomName { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public string StartDate { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public string EndDate { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public string StartTime { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public string EndTime { get; set; }
+    }
+}

Edu.Model/ViewModel/Course/RB_Teaching_BonusDetail_ViewModel.cs

@@ -21,10 +21,21 @@ namespace Edu.Model.ViewModel.Course
         /// 教师名称
         /// </summary>
         public string TeacherName { get; set; }
+
+        /// <summary>
+        /// 时间段
+        /// </summary>
+        public string TimeBucket { get; set; }
         /// <summary>
         /// 班级名称
         /// </summary>
         public string ClassName { get; set; }
+
+        /// <summary>
+        /// 班级编号
+        /// </summary>
+        public string ClassNo { get; set; }
+
         /// <summary>
         /// 代课课时
         /// </summary>
@@ -39,5 +50,38 @@ namespace Edu.Model.ViewModel.Course
         /// 奖金确认  1是
         /// </summary>
         public int Q_BonusConfirm { get; set; }
+
+        #region 报表统计
+        /// <summary>
+        /// 课程id
+        /// </summary>
+        public int CouseId { get; set; }
+
+        /// <summary>
+        /// 课程名称
+        /// </summary>
+        public string CourseName { get; set; }
+
+        /// <summary>
+        /// 课时数量
+        /// </summary>
+        public decimal KSNum { get; set; }
+
+        /// <summary>
+        /// 抵扣课时数量
+        /// </summary>
+        public decimal DKNum { get; set; }
+
+        /// <summary>
+        /// 小时
+        /// </summary>
+        public decimal Hours { get; set; }
+
+        /// <summary>
+        /// 小时课时费
+        /// </summary>
+        public decimal HourMoney { get; set; }
+
+        #endregion
     }
 }
\ No newline at end of file

Edu.Model/ViewModel/Duty/RB_Duty_Content_ViewModel.cs

@@ -35,5 +35,15 @@ namespace Edu.Model.ViewModel.Duty
         /// 创建时间
         /// </summary>
         public string CreateTimeStr { get { return Common.ConvertHelper.FormatTimeStr(this.CreateTime); } }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public string CreateTimeStr2 { get; set; }
+
+        /// <summary>
+        /// 值班事项名称
+        /// </summary>
+        public string ItemName { get; set; }
     }
 }

Edu.Model/ViewModel/Duty/RB_Duty_Item_ViewModel.cs

@@ -39,5 +39,42 @@ namespace Edu.Model.ViewModel.Duty
         /// 值班项目图片列表
         /// </summary>
         public List<string> ItemImgList { get; set; }
+
+        /// <summary>
+        /// 值班事项分类字符串
+        /// </summary>
+        public string DutyCategoryStr
+        {
+            get
+            {
+
+                string str = "";
+                switch (this.DutyCategory)
+                {
+                    case 1: str = "工作清单"; break;
+                    case 2: str = "突发事项"; break;
+                    case 3: str = "交接说明"; break;
+                }
+                return str;
+            }
+        }
+
+        /// <summary>
+        /// 值班类型字符串
+        /// </summary>
+        public string DutyTypeStr
+        {
+            get
+            {
+                string str = "";
+                switch (this.DutyType)
+                {
+                    case 1: str = "规则事项"; break;
+                    case 2: str = "值班事项"; break;
+
+                }
+                return str;
+            }
+        }
     }
 }

Edu.Model/ViewModel/Duty/RB_Duty_PlanDetails_ViewModel.cs

@@ -36,6 +36,16 @@ namespace Edu.Model.ViewModel.Duty
         /// </summary>
         public string DutyManIcon { get; set; }
 
+        /// <summary>
+        /// 值班日期
+        /// </summary>
+        public DateTime DutyDate { get; set; }
+
+        /// <summary>
+        /// 查询开始时间
+        /// </summary>
+        public string QStartDate { get; set; }
+
         /// <summary>
         /// 工作清单列表
         /// </summary>

Edu.Model/ViewModel/Duty/RB_Visitor_ViewModel.cs

@@ -33,5 +33,10 @@ namespace Edu.Model.ViewModel.Duty
         /// 关键字查询
         /// </summary>
         public string KeyWords { get; set; }
+
+        /// <summary>
+        /// 是否查看所有人访客
+        /// </summary>
+        public int IsQueryAll { get; set; }
     }
 }

Edu.Model/ViewModel/Question/RB_Question_RoomUseLog_ViewModel.cs

@@ -45,5 +45,20 @@ namespace Edu.Model.ViewModel.Question
         /// 间隔多少个15分钟
         /// </summary>
         public int IntervalNum { get; set; }
+
+        /// <summary>
+        /// 课程名称
+        /// </summary>
+        public string CourseName { get; set; }
+
+        /// <summary>
+        /// 课程进度
+        /// </summary>
+        public decimal CompleteProgress { get; set; }
+
+        /// <summary>
+        /// 学生
+        /// </summary>
+        public string StudentName { get; set; }
     }
 }

Edu.Model/ViewModel/Reserve/RB_Reserve_Class_Extend.cs

@@ -35,6 +35,21 @@ namespace Edu.Model.ViewModel.Reserve
         /// </summary>
         public string RoomName { get; set; }
 
+        /// <summary>
+        /// 教室座位数
+        /// </summary>
+        public int RoomNum { get; set; }
+
+        /// <summary>
+        /// 报名人数
+        /// </summary>
+        public int JoinNum { get; set; }
+
+        /// <summary>
+        /// 访客预约列表
+        /// </summary>
+        public List<RB_Visitor_Reserve_Extend> VisitorList { get; set; }
+
         /// <summary>
         /// 预约日期字符串
         /// </summary>

Edu.Model/ViewModel/Reserve/RB_Visitor_Reserve_Extend.cs

@@ -27,6 +27,11 @@ namespace Edu.Model.ViewModel.Reserve
         /// </summary>
         public string ClassTime { get; set; }
 
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public string EndTime { get; set; }
+
         /// <summary>
         /// 教师编号
         /// </summary>
@@ -46,6 +51,11 @@ namespace Edu.Model.ViewModel.Reserve
 
         #region 扩展字段
 
+        /// <summary>
+        /// 约课日期
+        /// </summary>
+        public string ClassDateStr { get { return Common.ConvertHelper.FormatDate(this.ClassDate); } }
+
         /// <summary>
         /// 访客名称
         /// </summary>
@@ -61,5 +71,59 @@ namespace Edu.Model.ViewModel.Reserve
         /// </summary>
         public string RoomName { get; set; }
         #endregion
+
+        /// <summary>
+        /// 预约班级编号
+        /// </summary>
+        public string Q_ReserveClassIds { get; set; }
+
+        /// <summary>
+        /// 预约状态(0-跟进中,1-成交，2-流单,3-取消）
+        /// </summary>
+        public string Q_ReserveStatus { get; set; }
+
+        /// <summary>
+        /// 报名人数
+        /// </summary>
+        public int JoinNum { get; set; }
+
+        /// <summary>
+        /// 预约状态字符串
+        /// </summary>
+        public string ReserveStatusStr
+        {
+            get
+            {
+                string str = "";
+                switch (this.ReserveStatus)
+                {
+                    case 0: str = "跟进中"; break;
+                    case 1: str = "成交"; break;
+                    case 2: str = "流单"; break;
+                    case 3: str = "取消"; break;
+                }
+                return str;
+            }
+        }
+
+        /// <summary>
+        /// 开始日期
+        /// </summary>
+        public string StartClassDate { get; set; }
+
+        /// <summary>
+        /// 结束日期
+        /// </summary>
+        public string EndClassDate { get; set; }
+
+        /// <summary>
+        /// 账户表Id
+        /// </summary>
+        public int AccountId { get; set; }
+
+        /// <summary>
+        /// 是否查询所有约课(1-是)
+        /// </summary>
+        public int IsQueryAll { get; set; }
     }
 }

Edu.Model/ViewModel/User/Employee_ViewModel.cs

@@ -97,6 +97,21 @@ namespace Edu.Model.ViewModel.User
         /// </summary>
         public string EndBirthDate { get; set; }
 
+        /// <summary>
+        /// 老师消耗课时统计  1是
+        /// </summary>
+        public int IsHoursStatistics { get; set; }
+
+        /// <summary>
+        /// 课时消费 开始时间
+        /// </summary>
+        public string HoursStartTime { get; set; }
+
+        /// <summary>
+        /// 课时消费 结束时间
+        /// </summary>
+        public string HoursEndTime { get; set; }
+
         /// <summary>
         /// 部门层级
         /// </summary>
@@ -171,5 +186,10 @@ namespace Edu.Model.ViewModel.User
         /// 直接主管ids
         /// </summary>
         public string DirectSupervisorIds { get; set; }
+
+        /// <summary>
+        /// 基础课时费
+        /// </summary>
+        public decimal BaseHourFee { get; set; }
     }
 }

Edu.Model/ViewModel/User/RB_Account_ViewModel.cs

@@ -18,6 +18,11 @@ namespace Edu.Model.ViewModel.User
         /// </summary>
         public string QIds { get; set; }
 
+        /// <summary>
+        /// 子项表编号
+        /// </summary>
+        public string QAccountIds { get; set; }
+
         /// <summary>
         /// 集团名称
         /// </summary>

Edu.Model/ViewModel/User/RB_Teacher_ViewModel.cs

 using Edu.Common;
 using Edu.Common.Plugin;
 using System;
+using System.Collections.Generic;
 
 namespace Edu.Model.ViewModel.User
 {
@@ -114,5 +115,16 @@ namespace Edu.Model.ViewModel.User
         /// 密码
         /// </summary>
         public string Password { get; set; }
+
+        /// <summary>
+        /// 老师特长
+        /// </summary>
+        public List<int> ChooseSpecialty
+        {
+            get
+            {
+                return Common.ConvertHelper.StringToList(this.Specialty);
+            }
+        }
     }
 }
\ No newline at end of file

Edu.Module.Advertising/AdvertisingModule.cs

+using System;
+using System.Collections.Generic;
+using Edu.Common.Plugin;
+using Edu.Model.Entity.Advertising;
+using Edu.Model.ViewModel.Advertising;
+using Edu.Repository.Advertising;
+using VT.FW.DB;
+
+namespace Edu.Module.Advertising
+{
+    public class AdvertisingModule
+    {
+        private Rb_AdvertisingRepository repository = new Rb_AdvertisingRepository();
+
+        /// <summary>
+        /// 广告基础信息处理类
+        /// </summary>
+        private Rb_Advertising_MakeRepository advertisingMakeRepository = new Rb_Advertising_MakeRepository();
+
+
+        #region 广告制作
+        /// <summary>
+        /// 获取创建的广告信息
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="model"></param>
+        /// <param name="count"></param>
+        /// <returns></returns>
+        public List<Rb_Advertising_Make_Extend> GetPageList(int pageIndex, int pageSize, Rb_Advertising_Make_Extend model, out long count)
+        {
+            return advertisingMakeRepository.GetPage(pageIndex, pageSize, model, out count);
+        }
+
+        /// <summary>
+        /// 获取广告信息
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public List<Rb_Advertising_Make_Extend> GetList(Rb_Advertising_Make_Extend model)
+        {
+            return advertisingMakeRepository.Get(model);
+        }
+
+        /// <summary>
+        /// 添加修改
+        /// </summary>
+        /// <param name="model"></param>
+        /// <param name="fileName"></param>
+        /// <param name="fileSize"></param>
+        /// <returns></returns>
+        public int Set(Rb_Advertising_Make_Extend model, string fileName, long fileSize)
+        {
+            int Id = 0;
+            if (model.ID > 0)
+            {
+                Id = model.ID;
+                IDictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    { nameof(Rb_Advertising_Make.SecretKey),model.SecretKey},
+                    { nameof(Rb_Advertising_Make.AdvertisingPicUrl),model.AdvertisingPicUrl},
+                    { nameof(Rb_Advertising_Make.Content),model.Content},
+                };
+                IList<WhereHelper> whereHelpers = new List<WhereHelper>()
+                {
+                    new WhereHelper (){ FiledName=nameof(Rb_Advertising_Make.ID),FiledValue=model.ID,OperatorEnum=OperatorEnum.Equal}
+                };
+                advertisingMakeRepository.Update(fileds, whereHelpers);
+            }
+            else
+            {
+                Id = advertisingMakeRepository.Insert(model);
+            }
+            return Id;
+        }
+
+
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="ID"></param>
+        /// <param name="EmployeeId"></param>
+        /// <returns></returns>
+        public bool Remove(int ID, int EmployeeId)
+        {
+            IDictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                { nameof(Rb_Advertising_Make_Extend.Status),(int) Common.Enum.DateStateEnum.Delete},
+            };
+            IList<WhereHelper> whereHelpers = new List<WhereHelper>()
+            {
+                new WhereHelper (){ FiledName=nameof(Rb_Advertising_Make_Extend.ID),FiledValue=ID,OperatorEnum=OperatorEnum.Equal}
+            };
+            bool flag = advertisingMakeRepository.Update(fileds, whereHelpers);
+            return flag;
+        }
+
+
+        #endregion
+
+
+        #region 广告管理
+        /// <summary>
+        /// 新增修改广告基础信息
+        /// </summary>
+        /// <param name="dmodel"></param>
+        public bool SetAdvertising(Rb_Advertising_Extend dmodel)
+        {
+            bool flag = false;
+            int ID = 0;
+            try
+            {
+                if (dmodel.ID > 0)
+                {
+                    ID = dmodel.ID;
+                    var bamodel = repository.GetEntity(dmodel.ID);
+                    bamodel.ChargeAmount = dmodel.ChargeAmount;
+                    bamodel.IsFee = dmodel.IsFee;
+                    bamodel.Title = dmodel.Title;
+                    bamodel.Lable = dmodel.Lable;
+                  //  bamodel.PictureUrl = dmodel.PictureUrl;
+                   // bamodel.SamplePicturesUrl = dmodel.SamplePicturesUrl;
+                    flag = repository.Update(bamodel);
+                }
+                else
+                {
+                    Rb_Advertising model = dmodel.RefMapperTo<Rb_Advertising>();
+                    model.Status = 0;
+                    ID = repository.Insert(model);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "SetAdvertising");
+                return false;
+            }
+            return true;
+        }
+        /// <summary>
+        /// 获取广告列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="lineId"></param>
+        /// <param name="seriesId"></param>
+        /// <param name="countryId"></param>
+        /// <param name="advName"></param>
+        /// <param name="IsFee"></param>
+        /// <param name="RB_Group_id"></param>
+        /// <returns></returns>
+        public List<Rb_Advertising_Extend> GetAdvertisingList(int pageIndex, int pageSize, out long count, string advName, int IsFee, int RB_Group_id)
+        {
+            var list = repository.GetAdvertisingList(pageIndex, pageSize, out count, advName, IsFee, RB_Group_id);
+            return list;
+        }
+
+        /// <summary>
+        /// 根据where 查询列表
+        /// </summary>
+        /// <param name="lineId"></param>
+        /// <param name="seriesId"></param>
+        /// <param name="countryId"></param>
+        /// <param name="advName"></param>
+        /// <param name="RB_Group_id"></param>
+        /// <returns></returns>
+        public List<Rb_Advertising_Extend> GetAdvertsingListForComboBox( string advName, int RB_Group_id)
+        {
+            var list = repository.GetAdvertsingListForComboBox( advName, RB_Group_id);
+            return list;
+        }
+
+        /// <summary>
+        /// 删除广告
+        /// </summary>
+        /// <param name="bAID"></param>
+        public bool DelAdvertising(int bAID)
+        {
+            try
+            {
+                var fileds = new Dictionary<string, object>
+                {
+                    { nameof(Rb_Advertising.Status), 1},
+                };
+                var whereHelpers = new List<WhereHelper>
+                {
+                    new WhereHelper()
+                    {
+                        FiledName = nameof(Rb_Advertising.ID),
+                        FiledValue = bAID,
+                        OperatorEnum = OperatorEnum.Equal
+                    }
+                };
+                var flag = repository.Update(fileds, whereHelpers);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "DelAdvertising");
+                return false;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// 获取实体详情
+        /// </summary>
+        /// <param name="bAID"></param>
+        /// <returns></returns>
+        public Rb_Advertising GetAdvertsingInfo(int bAID)
+        {
+            return repository.GetEntity(bAID);
+        }
+        #endregion
+    }
+}

Edu.Module.Advertising/Edu.Module.Advertising.csproj

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

Edu.Module.Course/CourseOfferModule.cs

@@ -400,6 +400,7 @@ namespace Edu.Module.Course
                         int CourseId = classRepository.GetEntity(orderModel.ClassId)?.CouseId ?? 0;
                         if (CourseId > 0)
                         {
+                            orderModel.CourseId = CourseId;
                             //获取课程优惠
                             var coursePreferentialList = course_PreferentialRepository.GetCoursePreferentialListRepostory(new RB_Course_Preferential_Extend()
                             {
@@ -424,9 +425,11 @@ namespace Edu.Module.Course
                                 }
                                 orderModel.CommissionType = coursePreferentialModel?.SaleCommissionType ?? 0;
                                 orderModel.CommissionRate = coursePreferentialModel?.SaleCommissionMoney ?? 0;
+                                orderModel.CommissionTypeTH = coursePreferentialModel?.B2BCommissionType ?? 0;
+                                orderModel.CommissionRateTH = coursePreferentialModel?.B2BCommissionMoney ?? 0;
                                 if (coursePreferentialModel != null)
                                 {
-                                    orderModel.CommissionRemark = "使用优惠Id:" + coursePreferentialModel.Id + " 返佣类型:" + orderModel.CommissionType + " 返佣比例/金额:" + orderModel.CommissionRate;
+                                    orderModel.CommissionRemark = "使用优惠Id:" + coursePreferentialModel.Id + " 返佣类型:" + orderModel.CommissionType + " 返佣比例/金额:" + orderModel.CommissionRate + " 同行返佣类型:" + orderModel.CommissionTypeTH + " 同行返佣比例/金额:" + orderModel.CommissionRateTH;
                                 }
                                 #endregion
                             }

Edu.Module.Course/OrderModule2.cs

@@ -106,7 +106,7 @@ namespace Edu.Module.Course
             }
             var teacherId = teacherModel?.Id ?? 0;
             //基础课时分钟数
-            var BasicMinutes = class_ConfigRepository.GetClassConfigRepository(new RB_Class_Config_ViewModel() { Group_Id = userinfo.Group_Id })?.BasicMinutes ?? 45;
+            var BasicMinutes = class_ConfigRepository.GetClassMinutesRepository(orderModel.ClassId);
             var stuCheckList = class_CheckRepository.GetGuestFinishMinutesRepository(GuestId.ToString());
             //总签到上课分钟数
             var totalFinishMinutes = stuCheckList?.Sum(qitem => qitem.FinishMinutes) ?? 0;
@@ -116,7 +116,11 @@ namespace Edu.Module.Course
             //课时单价
             var classHourPrice = Math.Round(orderModel.PreferPrice / orderModel.GuestNum / classModel.ClassHours, 2);
             //预计退款金额
-            var backMoney = (classModel.ClassHours - FinishHours) * classHourPrice;
+            decimal backMoney =0;
+            //backMoney = (classModel.ClassHours - FinishHours) * classHourPrice;
+            //违约金
+            decimal breakContractPrice = (classModel.ClassHours - FinishHours) * classHourPrice * Convert.ToDecimal(0.1);
+            backMoney = (orderModel.Income + orderModel.PlatformTax) - FinishHours * classHourPrice - breakContractPrice;
 
             var backClassModel = new RB_Student_BackClass_ViewModel()
             {

Edu.Module.Course/StudentBillModule.cs

@@ -121,7 +121,7 @@ namespace Edu.Module.Course
             //班级实体类
             var classModel = classRepository.GetEntity(backModel.ClassId);
             //基础课时分钟数
-            var BasicMinutes = class_ConfigRepository.GetClassConfigRepository(new RB_Class_Config_ViewModel() { Group_Id = backModel.Group_Id })?.BasicMinutes ?? 45;
+            var BasicMinutes = class_ConfigRepository.GetClassMinutesRepository(backModel.ClassId);
             var stuCheckList = class_CheckRepository.GetGuestFinishMinutesRepository(backModel.GuestId.ToString());
             //总签到上课分钟数
             var totalFinishMinutes = stuCheckList?.Sum(qitem => qitem.FinishMinutes) ?? 0;
@@ -1026,9 +1026,11 @@ namespace Edu.Module.Course
                     }
                     orderModel.CommissionType = coursePreferentialModel?.SaleCommissionType ?? 0;
                     orderModel.CommissionRate = coursePreferentialModel?.SaleCommissionMoney ?? 0;
+                    orderModel.CommissionTypeTH = coursePreferentialModel?.B2BCommissionType ?? 0;
+                    orderModel.CommissionRateTH = coursePreferentialModel?.B2BCommissionMoney ?? 0;
                     if (coursePreferentialModel != null)
                     {
-                        orderModel.CommissionRemark = "使用优惠Id:" + coursePreferentialModel.Id + " 返佣类型:" + orderModel.CommissionType + " 返佣比例/金额:" + orderModel.CommissionRate;
+                        orderModel.CommissionRemark = "使用优惠Id:" + coursePreferentialModel.Id + " 返佣类型:" + orderModel.CommissionType + " 返佣比例/金额:" + orderModel.CommissionRate + " 同行返佣类型:" + orderModel.CommissionTypeTH + " 同行返佣比例/金额:" + orderModel.CommissionRateTH;
                     }
                     #endregion
                 }

Edu.Module.Course/TeachingRewardsModule.cs

@@ -536,7 +536,9 @@ namespace Edu.Module.Course
                         var ts = Convert.ToDateTime(nowTime + " " + qitem.EndTime) - Convert.ToDateTime(nowTime + " " + qitem.StartTime);
                         minute += (int)ts.TotalMinutes;
                     }
-                    int ksNum = minute / configModel.BasicMinutes; // 未达到一课时时间  算不算一课时
+                    int ClassHourMinute = configModel.BasicMinutes;//课时分钟数
+                    if (item.ClassHourMinute > 0) { ClassHourMinute = item.ClassHourMinute; }
+                    int ksNum = minute / ClassHourMinute; // 未达到一课时时间  算不算一课时
                     //查询课单价
                     var typeModel = typeList.Where(x => x.CTypeId == item.ClassType).FirstOrDefault();
                     var teacherModel = teacherList.Where(x => x.TId == item.TeacherId).FirstOrDefault();
@@ -605,7 +607,7 @@ namespace Edu.Module.Course
                     List<int> TeacherIdList = blist.Select(x => x.TeacherId).Distinct().ToList();
                     foreach (var item in TeacherIdList)
                     {
-                        var qblist = blist.Where(x => x.TeacherId == item).OrderBy(x => x.UnitPrice).ThenBy(x => x.Date).ToList();
+                        var qblist = blist.Where(x => x.TeacherId == item).OrderBy(x => x.Date).ThenBy(x => x.UnitPrice).ToList();
                         int BasicHours = configModel.BasicHours;
                         foreach (var qitem in qblist)
                         {
@@ -831,21 +833,29 @@ namespace Edu.Module.Course
             return teaching_BonusDetailRepository.GetList(demodel);
         }
 
-
-
-        #endregion
-
-        #region 教师绩效
-
         /// <summary>
-        /// 获取教师绩效分页列表
+        /// 获取列表
         /// </summary>
-        /// <param name="pageIndex"></param>
-        /// <param name="pageSize"></param>
-        /// <param name="count"></param>
-        /// <param name="dmodel"></param>
+        /// <param name="demodel"></param>
         /// <returns></returns>
-        public List<RB_Teaching_Perf_ViewModel> GetTeachingPerfPageList(int pageIndex, int pageSize, out long count, RB_Teaching_Perf_ViewModel dmodel)
+        public List<RB_Teaching_BonusDetail_ViewModel> GetListByTeacherId(RB_Teaching_BonusDetail_ViewModel demodel)
+        {
+            return teaching_BonusDetailRepository.GetListByTeacherId(demodel);
+        }
+
+            #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_Perf_ViewModel> GetTeachingPerfPageList(int pageIndex, int pageSize, out long count, RB_Teaching_Perf_ViewModel dmodel)
         {
             var list = teaching_PerfRepository.GetPageList(pageIndex, pageSize, out count, demodel: dmodel);
             if (list.Any())
@@ -1207,7 +1217,9 @@ namespace Edu.Module.Course
             //班级课时总分钟数
             int TotalClassMin = class_PlanRepository.GetClassTotalMinute(classId, classModel.Group_Id);
             //总课时
-            int ksNum = TotalClassMin / configModel.BasicMinutes; // 未达到一课时时间  不算一课时
+            int ClassHourMinute = configModel.BasicMinutes;//课时分钟数
+            if (classModel.ClassHourMinute > 0) { ClassHourMinute = classModel.ClassHourMinute; }
+            int ksNum = TotalClassMin / ClassHourMinute; // 未达到一课时时间  不算一课时
 
             //满班率
             decimal FullClassRate = 0;

Edu.Module.Duty/DutyModule.cs

@@ -78,6 +78,20 @@ namespace Edu.Module.Duty
         /// <returns></returns>
         public bool SetDutyItemModule(RB_Duty_Item_ViewModel model)
         {
+            if (model.DutyCategory == 1)
+            { 
+
+            }
+            else if (model.DutyCategory == 2)
+            {
+                model.DutyType = 1;
+                model.ItemType = 0;
+            }
+            else if (model.DutyCategory == 3)
+            {
+                model.DutyType = 1;
+                model.ItemType = 0;
+            }
             if (model.Id == 0)
             {
                 return dutyItemRepository.Insert(model) > 0;
@@ -93,6 +107,8 @@ namespace Edu.Module.Duty
                     { nameof(RB_Duty_Item_ViewModel.UpdateBy),model.UpdateBy},
                     { nameof(RB_Duty_Item_ViewModel.UpdateTime),model.UpdateTime},
                     { nameof(RB_Duty_Item_ViewModel.ItemImg),model.ItemImg},
+                    { nameof(RB_Duty_Item_ViewModel.DutyCategory),model.DutyCategory},
+                    { nameof(RB_Duty_Item_ViewModel.DutyType),model.DutyType},
                 };
                 return dutyItemRepository.Update(fileds, new WhereHelper(nameof(RB_Duty_Item_ViewModel.Id), model.Id));
             }