1111

Edu.Model/ViewModel/Scroll/RB_Plan_Appointment_Details_ViewModel.cs

@@ -49,5 +49,10 @@ namespace Edu.Model.ViewModel.Scroll
         /// 集团编号
         /// </summary>
         public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 学生姓名
+        /// </summary>
+        public string StuName { get; set; }
     }
 }

Edu.Module.Course/PlanAppoimentModule.cs

@@ -305,6 +305,7 @@ namespace Edu.Module.Course
                 var obj = new
                 {
                     DateStr = Common.ConvertHelper.FormatDate(newDate),
+                    WeekStr= Common.ConvertHelper.GetWeekDay(newDate),
                     TimeList= subTimeList
                 };
                 list.Add(obj);

Edu.Repository/Scroll/RB_Plan_Appointment_DetailsRepository.cs

@@ -56,10 +56,10 @@ WHERE 1=1
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT  A.*,B.Date,B.StartTime,B.EndTime
+SELECT  A.*,B.Date,B.StartTime,B.EndTime,IFNULL(C.StuName,'') StuName
 FROM RB_Plan_Appointment_Details AS A INNER JOIN RB_Plan_Appointment AS B ON A.PlanAppointmentId=B.Id
-WHERE 1=1  
-");
+     LEFT JOIN rb_student AS C ON A.StuId=C.StuId
+WHERE 1=1  ");
             if (query != null)
             {
                 if (query.Group_Id > 0)
@@ -79,6 +79,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Plan_Appointment_Details_ViewModel.Account_Id), query.Account_Id);
                 }
+                if (query.PlanAppointmentId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Plan_Appointment_Details_ViewModel.PlanAppointmentId), query.PlanAppointmentId);
+                }
             }
             var list = Get<RB_Plan_Appointment_Details_ViewModel>(builder.ToString()).ToList();
             return list;

Edu.WebApi/Controllers/Course/PlanAppoimentController.cs

@@ -81,7 +81,6 @@ namespace Edu.WebApi.Controllers.Course
             {
                 startDate = Common.ConvertHelper.FormatDate(DateTime.Now);
             }
-
             if (string.IsNullOrEmpty(endDate))
             {
                 endDate = Common.ConvertHelper.FormatDate(Convert.ToDateTime(startDate).AddMonths(1));
@@ -89,5 +88,39 @@ namespace Edu.WebApi.Controllers.Course
             var data = planAppoiment.GetPlanAppointmentStaticModule(startDate, endDate, base.UserInfo.Group_Id);
             return ApiResult.Success(data: data);
         }
+
+        /// <summary>
+        /// 获取预约详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetPlanAppointmentDetail()
+        {
+            int PlanAppointmentId = base.ParmJObj.GetInt("PlanAppointmentId");
+            if (PlanAppointmentId <= 0)
+            {
+                return ApiResult.ParamIsNull(message: "请选择要查看预约信息!");
+            }
+            List<object> list = new List<object>();
+            var dataList = planAppoiment.GetPlanAppointmentStatic(new Model.ViewModel.Scroll.RB_Plan_Appointment_Details_ViewModel()
+            {
+                PlanAppointmentId = PlanAppointmentId
+            });
+            foreach (var item in dataList)
+            {
+                list.Add(new
+                {
+                    item.StuId,
+                    item.StuName,
+                    item.StartTime,
+                    item.EndTime,
+                    DateStr = Common.ConvertHelper.FormatDate(item.Date),
+                    CreateTime = Common.ConvertHelper.FormatTime(item.CreateTime),
+                    item.Status,
+                    StatusStr = item.Status == 0 ? "正常" : "取消"
+                });
+            }
+            return ApiResult.Success(data: list);
+        }
     }
 }