页面修改

Edu.Model/Entity/Reserve/RB_Reserve_Class.cs

@@ -80,5 +80,10 @@ namespace Edu.Model.Entity.Reserve
 		/// 结束时间
 		/// </summary>
 		public string EndTime { get; set; }
+
+		/// <summary>
+		/// 试听课程编号
+		/// </summary>
+		public int TrialLessonId { get; set; }
 	}
 }

Edu.Model/ViewModel/Course/RB_TrialLesson_Extend.cs

@@ -14,5 +14,15 @@ namespace Edu.Model.ViewModel.Course
         /// 创建人
         /// </summary>
         public string CreateByName { get; set; }
+
+        /// <summary>
+        /// 教师名称
+        /// </summary>
+        public string TeacherName { get; set; }
+
+        /// <summary>
+        /// 创建时间字符串
+        /// </summary>
+        public string CreateTimeStr { get { return Common.ConvertHelper.FormatTime(this.CreateTime); } }
     }
 }

Edu.Model/ViewModel/Reserve/RB_Reserve_Class_Extend.cs

@@ -59,5 +59,10 @@ namespace Edu.Model.ViewModel.Reserve
         /// 创建时间字符串
         /// </summary>
         public string CreateTimeStr { get { return Common.ConvertHelper.FormatTime(this.CreateTime); } }
+
+        /// <summary>
+        /// 试听课程名称
+        /// </summary>
+        public string LessonName { get; set; }
     }
 }

Edu.Model/ViewModel/Reserve/RB_Visitor_Reserve_Extend.cs

@@ -156,6 +156,11 @@ namespace Edu.Model.ViewModel.Reserve
         /// </summary>
         public int TrialLessonCount { get; set; }
 
+        /// <summary>
+        /// 试听课程编号
+        /// </summary>
+        public int TrialLessonId { get; set; }
+
         /// <summary>
         /// 查询日期
         /// </summary>

Edu.Module.Duty/VisitorReserveModule.cs

@@ -95,6 +95,7 @@ namespace Edu.Module.Duty
                 UpdateBy = model.UpdateBy,
                 UpdateTime = model.UpdateTime,
                 EndTime=model.EndTime,
+                TrialLessonId=model.TrialLessonId
             };
             if (model.ReserveClassId <= 0)
             {
@@ -286,6 +287,7 @@ namespace Edu.Module.Duty
                     {nameof(RB_Reserve_Class_Extend.ClassContent),model.ClassContent  },
                     {nameof(RB_Reserve_Class_Extend.UpdateBy),model.UpdateBy  },
                     {nameof(RB_Reserve_Class_Extend.UpdateTime),model.UpdateTime  },
+                    {nameof(RB_Reserve_Class_Extend.TrialLessonId),model.TrialLessonId  },
                 };
                 flag = reserve_ClassRepository.Update(fileds, new WhereHelper(nameof(RB_Reserve_Class_Extend.ReserveClassId), model.ReserveClassId));
                 if (flag && model.TeacherId != oldModel.TeacherId)

Edu.Repository/Course/RB_TrialLessonRepository.cs

@@ -27,8 +27,8 @@ namespace Edu.Repository.Course
             StringBuilder builder = new StringBuilder();
             var parameters = new DynamicParameters();
             builder.AppendFormat(@"
-SELECT A.* 
-FROM RB_TrialLesson AS A
+SELECT A.* ,IFNULL(D.TeacherName,'') AS TeacherName
+FROM RB_TrialLesson AS A LEFT JOIN rb_teacher AS D ON A.TeacherId=D.TId
 WHERE 1=1
 ");
             builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_TrialLesson_Extend.Status), (int)DateStateEnum.Normal);

Edu.Repository/Reserve/RB_Reserve_ClassRepository.cs

@@ -28,9 +28,11 @@ namespace Edu.Repository.Reserve
             var parameters = new DynamicParameters();
             builder.Append(@"
 SELECT A.*,IFNULL(D.TeacherName,'') AS TeacherName,IFNULL(E.RoomName,'') AS RoomName,IFNULL(E.SeatNum,0) AS RoomNum
+       ,IFNULL(F.LessonName,'') AS LessonName
 FROM RB_Reserve_Class AS A LEFT JOIN rb_teacher AS D ON A.TeacherId=D.TId
      LEFT JOIN rb_class_room AS E ON A.ClassRoomId=E.RoomId
-WHERE 1=1 
+     LEFT JOIN rb_triallesson AS F ON A.TrialLessonId=F.Id
+WHERE 1=1
 ");
             builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Reserve_Class_Extend.Status), (int)DateStateEnum.Normal);
             if (query != null)
@@ -55,6 +57,11 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Reserve_Class_Extend.ClassRoomId), query.ClassRoomId);
                 }
+                if (!string.IsNullOrEmpty(query.LessonName))
+                {
+                    builder.AppendFormat(" AND F.{0} LIKE @LessonName ", nameof(RB_Reserve_Class_Extend.LessonName));
+                    parameters.Add("LessonName", "%" + query.LessonName.Trim() + "%");
+                }
             }
             builder.AppendFormat(" ORDER BY A.{0} ASC ", nameof(RB_Reserve_Class_Extend.ClassDate));
             return GetPage<RB_Reserve_Class_Extend>(pageIndex,pageSize,out rowsCount, builder.ToString(),parameters).ToList();

Edu.WebApi/Controllers/Duty/VisitorReserveController.cs

@@ -106,6 +106,7 @@ namespace Edu.WebApi.Controllers.Duty
                 ClassRoomId=base.ParmJObj.GetInt("ClassRoomId"),
                 ClassContent = base.ParmJObj.GetStringValue("ClassContent"),
                 EndTime=base.ParmJObj.GetStringValue("EndTime"),
+                TrialLessonId=base.ParmJObj.GetInt("TrialLessonId"),
             };
             if (string.IsNullOrEmpty(model.ClassTime))
             {
@@ -180,6 +181,7 @@ namespace Edu.WebApi.Controllers.Duty
                 EndClassDate=base.ParmJObj.GetStringValue("EndClassDate"),
                 TeacherId=base.ParmJObj.GetInt("TeacherId"),
                 ClassRoomId=base.ParmJObj.GetInt("ClassRoomId"),
+                LessonName=base.ParmJObj.GetStringValue("LessonName"),
             };
             var list = visitorReserveModule.GetReserveClassPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             foreach (var item in list)
@@ -231,6 +233,7 @@ namespace Edu.WebApi.Controllers.Duty
                 ClassRoomId = base.ParmJObj.GetInt("ClassRoomId"),
                 ClassContent = base.ParmJObj.GetStringValue("ClassContent"),
                 EndTime=base.ParmJObj.GetStringValue("EndTime"),
+                TrialLessonId=base.ParmJObj.GetInt("TrialLessonId"),
             };
             if (string.IsNullOrEmpty(model.ClassTime))
             {