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

Edu.Model/ViewModel/Reserve/RB_Reserve_Class_Extend.cs

@@ -10,9 +10,39 @@ namespace Edu.Model.ViewModel.Reserve
     /// </summary>
     public class RB_Reserve_Class_Extend : RB_Reserve_Class
     {
+        /// <summary>
+        /// 开始日期
+        /// </summary>
+        public string StartClassDate { get; set; }
+
+        /// <summary>
+        /// 结束日期
+        /// </summary>
+        public string EndClassDate { get; set; }
+
         /// <summary>
         /// 创建人
         /// </summary>
         public string CreateByName { get; set; }
+
+        /// <summary>
+        /// 教师名称
+        /// </summary>
+        public string TeacherName { get; set; }
+
+        /// <summary>
+        /// 教室名称
+        /// </summary>
+        public string RoomName { get; set; }
+
+        /// <summary>
+        /// 预约日期字符串
+        /// </summary>
+        public string ClassDateStr { get { return Common.ConvertHelper.FormatDate(this.ClassDate); } }
+
+        /// <summary>
+        /// 创建时间字符串
+        /// </summary>
+        public string CreateTimeStr { get { return Common.ConvertHelper.FormatTime(this.CreateTime); } }
     }
 }

Edu.Model/ViewModel/Reserve/RB_Visitor_Reserve_Extend.cs

@@ -15,6 +15,8 @@ namespace Edu.Model.ViewModel.Reserve
         /// </summary>
         public string CreateByName { get; set; }
 
+        #region 约课班级信息
+
         /// <summary>
         /// 预约日期
         /// </summary>
@@ -39,5 +41,25 @@ namespace Edu.Model.ViewModel.Reserve
         /// 预约内容
         /// </summary>
         public string ClassContent { get; set; }
+
+        #endregion
+
+        #region 扩展字段
+
+        /// <summary>
+        /// 访客名称
+        /// </summary>
+        public string VisitorName { get; set; }
+
+        /// <summary>
+        /// 教师名称
+        /// </summary>
+        public string TeacherName { get; set; }
+
+        /// <summary>
+        /// 教室名称
+        /// </summary>
+        public string RoomName { get; set; }
+        #endregion
     }
 }

Edu.Repository/Reserve/RB_Reserve_ClassRepository.cs

@@ -26,10 +26,18 @@ namespace Edu.Repository.Reserve
             StringBuilder builder = new StringBuilder();
             var parameters = new DynamicParameters();
             builder.Append(@"
-SELECT A.*
-FROM RB_Reserve_Class AS A
+SELECT A.*,IFNULL(D.TeacherName,'') AS TeacherName,IFNULL(E.RoomName,'') AS RoomName,IFNULL(E.SeatNum,0) AS RoomNum
+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 
 ");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Reserve_Class_Extend.Group_Id), query.Group_Id);
+                }
+            }
 
             return GetPage<RB_Reserve_Class_Extend>(pageIndex,pageSize,out rowsCount, builder.ToString(),parameters).ToList();
         }
@@ -44,8 +52,9 @@ WHERE 1=1
             StringBuilder builder = new StringBuilder();
             var parameters = new DynamicParameters();
             builder.Append(@"
-SELECT A.*
-FROM RB_Reserve_Class AS A
+SELECT A.*,IFNULL(D.TeacherName,'') AS TeacherName,IFNULL(E.RoomName,'') AS RoomName
+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 
 ");
             return Get<RB_Reserve_Class_Extend>(builder.ToString(),parameters).ToList();

Edu.Repository/Reserve/RB_Visitor_ReserveRepository.cs

@@ -26,8 +26,11 @@ namespace Edu.Repository.Reserve
             StringBuilder builder = new StringBuilder();
             var parameters = new DynamicParameters();
             builder.Append(@"
-SELECT A.*
-FROM RB_Visitor_Reserve AS A
+SELECT A.*,IFNULL(B.`Name`,'') AS VisitorName,C.ClassDate,C.ClassTime,C.ClassContent,IFNULL(D.TeacherName,'') AS TeacherName,IFNULL(E.RoomName,'') AS RoomName
+FROM RB_Visitor_Reserve AS A LEFT JOIN rb_visitor AS B ON A.Visitor_Id=B.Id
+     LEFT JOIN rb_reserve_class AS C ON A.ReserveClassId=C.ReserveClassId
+     LEFT JOIN rb_teacher AS D ON C.TeacherId=D.TId
+     LEFT JOIN rb_class_room AS E ON C.ClassRoomId=E.RoomId
 WHERE 1=1 
 ");
 

Edu.WebApi/Controllers/Duty/VisitorReserveController.cs

@@ -88,7 +88,7 @@ namespace Edu.WebApi.Controllers.Duty
                 Remark = base.ParmJObj.GetStringValue("Remark"),
                 ReserveClassId = base.ParmJObj.GetInt("ReserveClassId"),
                 ClassDate=base.ParmJObj.GetDateTime("ClassDate"),
-                ClassTime = base.ParmJObj.GetStringValue("ReserveTime"),
+                ClassTime = base.ParmJObj.GetStringValue("ClassTime"),
                 TeacherId=base.ParmJObj.GetInt("TeacherId"),
                 ClassRoomId=base.ParmJObj.GetInt("ClassRoomId"),
                 ClassContent = base.ParmJObj.GetStringValue("ClassContent"),
@@ -144,6 +144,8 @@ namespace Edu.WebApi.Controllers.Duty
             var query = new RB_Reserve_Class_Extend()
             {
                 Group_Id = base.UserInfo.Group_Id,
+                StartClassDate=base.ParmJObj.GetStringValue("StartClassDate"),
+                EndClassDate=base.ParmJObj.GetStringValue("EndClassDate"),
             };
             var list = visitorReserveModule.GetReserveClassPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             foreach (var item in list)