页面修改

Edu.Model/Entity/Sell/RB_Bonus_Plan.cs

+using Edu.Common.Enum;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Sell
+{
+    /// <summary>
+    /// 课程顾问、市场达标奖金配置实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Bonus_Plan
+    {
+		/// <summary>
+		/// 主键编号
+		/// </summary>
+		public int Id { get; set; }
+
+		/// <summary>
+		/// 方案名称
+		/// </summary>
+		public string PlanName { get; set; }
+
+		/// <summary>
+		/// 基本工资
+		/// </summary>
+		public decimal BasicSalary { get; set; }
+
+		/// <summary>
+		/// 开单奖金
+		/// </summary>
+		public decimal OpenBonus { get; set; }
+
+		/// <summary>
+		/// 工龄工资
+		/// </summary>
+		public decimal WorkAgeSalary { get; set; }
+
+		/// <summary>
+		/// 每5条线索奖金
+		/// </summary>
+		public decimal ClueNumSalary { get; set; }
+
+		/// <summary>
+		/// 销售人员
+		/// </summary>
+		public string SaleIds { get; set; }
+
+		/// <summary>
+		/// 适用课程
+		/// </summary>
+		public string UseCourseIds { get; set; }
+
+		/// <summary>
+		/// 不适用课程
+		/// </summary>
+		public string NotUseCourseIds { 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 int Group_Id { get; set; }
+
+		/// <summary>
+		/// 学校编号
+		/// </summary>
+		public int School_Id { get; set; }
+
+		/// <summary>
+		/// 删除状态
+		/// </summary>
+		public DateStateEnum Status { get; set; }
+	}
+}

Edu.Model/Entity/Sell/RB_Bouns_PlanDetail.cs

+using Edu.Common.Enum;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Sell
+{
+    /// <summary>
+    /// 课程顾问、市场达标奖金配置阶梯实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Bouns_PlanDetail
+    {
+		/// <summary>
+		/// 主键编号
+		/// </summary>
+		public int DetailId { get; set; }
+
+		/// <summary>
+		/// 计划编号
+		/// </summary>
+		public int PlanId { get; set; }
+
+		/// <summary>
+		/// 开始人数
+		/// </summary>
+		public decimal StartNum { get; set; }
+
+		/// <summary>
+		/// 结束人数
+		/// </summary>
+		public decimal EndNum { get; set; }
+
+		/// <summary>
+		/// 删除状态
+		/// </summary>
+		public DateStateEnum Status { get; set; }
+	}
+}

Edu.Model/ViewModel/Sell/RB_Bonus_PlanExtend.cs

+using Edu.Model.Entity.Sell;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.Sell
+{
+    /// <summary>
+    /// 课程顾问、市场达标奖金配置扩展实体类
+    /// </summary>
+    public class RB_Bonus_PlanExtend : RB_Bonus_Plan
+    {
+        /// <summary>
+        /// 配置详细列表实体类
+        /// </summary>
+        public List<RB_Bouns_PlanDetail_Extend> DetailList { get; set; }
+    }
+}

Edu.Model/ViewModel/Sell/RB_Bouns_PlanDetail_Extend.cs

+using Edu.Model.Entity.Sell;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Edu.Model.ViewModel.Sell
+{
+    /// <summary>
+    ///  课程顾问、市场达标奖金配置阶梯扩展实体类
+    /// </summary>
+    public class RB_Bouns_PlanDetail_Extend : RB_Bouns_PlanDetail
+    {
+    }
+}

Edu.Module.Duty/VisitorReserveModule.cs

@@ -268,6 +268,7 @@ namespace Edu.Module.Duty
             var UserInfo = UserReidsCache.GetUserLoginInfo(model.CreateBy);
             var chooseDateTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(model.ClassDate) + " " + model.ClassTime);
             var chooseEndTime = Convert.ToDateTime(Common.ConvertHelper.FormatDate(model.ClassDate) + " " + model.EndTime);
+
             #region 教师验证
             if (CheckClassTeacherModule(chooseDateTime, chooseEndTime, model, out string newMsg))
             {
@@ -283,6 +284,7 @@ namespace Edu.Module.Duty
                 return false;
             }
             #endregion
+
             if (model.ReserveClassId > 0)
             {
                 var oldModel = GetReserveClassModule(model.ReserveClassId);

Edu.Repository/Grade/RB_Class_PlanRepository.cs

@@ -92,12 +92,12 @@ SELECT A.*,IFNULL(B.RoomName,'') AS RoomName,IFNULL(T.TeacherName,'') AS Teacher
        ,Time.StartTime,time.EndTime,time.ClassTimeId
        ,TIMESTAMPDIFF(MINUTE, CONCAT('2020-12-16',' ',time.StartTime), CONCAT('2020-12-16',' ',time.EndTime)) AS ClassMinutes
        ,time.TimeHour,c.ClassName,IFNULL(course.CourseName,'') AS CourseName
-FROM RB_Class_Plan AS A LEFT JOIN rb_class_room AS B ON A.ClassRoomId=B.RoomId
+FROM RB_Class_Plan AS A INNER JOIN rb_class as c ON c.ClassId=A.ClassId
+     LEFT JOIN rb_class_room AS B ON A.ClassRoomId=B.RoomId
      LEFT JOIN rb_teacher AS T ON A.TeacherId=T.TId
      LEFT JOIN rb_class_time AS time ON A.ClassPlanId=Time.ClassPlanId
-     LEFT JOIN rb_class as c ON c.ClassId=A.ClassId
      LEFT JOIN rb_course AS course ON c.CouseId=course.CourseId
-WHERE 1=1 
+WHERE 1=1 AND C.`Status`=0 AND C.ClassStatus<>3
 ");
             builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)DateStateEnum.Normal);
             if (query != null)