页面修改

Edu.Model/ViewModel/Scroll/RB_Plan_Appointment_Details_ViewModel.cs

@@ -19,5 +19,35 @@ namespace Edu.Model.ViewModel.Scroll
         /// rb_student表编号【查询使用】
         /// </summary>
         public string QStuIds { get; set; }
+
+        /// <summary>
+        /// 预约日期
+        /// </summary>
+        public DateTime Date { get; set; }
+
+        /// <summary>
+        /// 预约时段开始时间
+        /// </summary>
+        public string StartTime { get; set; }
+
+        /// <summary>
+        /// 预约时段结束时间
+        /// </summary>
+        public string EndTime { get; set; }
+
+        /// <summary>
+        /// 查询开始日期
+        /// </summary>
+        public string QStartDate { get; set; }
+
+        /// <summary>
+        /// 查询结束日期
+        /// </summary>
+        public string QEndDate { get; set; }
+
+        /// <summary>
+        /// 集团编号
+        /// </summary>
+        public int Group_Id { get; set; }
     }
 }

Edu.Module.Course/PlanAppoimentModule.cs

@@ -148,6 +148,7 @@ namespace Edu.Module.Course
                 {
                     var oldDetailModel = oldList?.Where(qitem => qitem.Status == 0 && qitem.StuId == item.StuId)?.FirstOrDefault();
                     item.DetailsId = oldDetailModel?.DetailsId ?? 0;
+                    item.PlanAppointmentId = model.Id;
                     if (item.DetailsId > 0)
                     {
                         plan_Appointment_DetailsRepository.Update(item);
@@ -175,5 +176,52 @@ namespace Edu.Module.Course
             bool flag = plan_Appointment_DetailsRepository.Update(fileds, new WhereHelper(nameof(RB_Plan_Appointment_Details_ViewModel.DetailsId), DetailsId));
             return flag;
         }
+
+        /// <summary>
+        /// 获取学员预约统计
+        /// </summary>
+        /// <param name="startDate"></param>
+        /// <param name="endDate"></param>
+        /// <param name="Group_Id"></param>
+        /// <returns></returns>
+        public List<object> GetPlanAppointmentStaticModule(string startDate,string endDate,int Group_Id)
+        {
+            List<object> list = new List<object>();
+            DateTime start = Convert.ToDateTime(startDate);
+            DateTime end = Convert.ToDateTime(endDate);
+            int days = (end - start).Days;
+            var timeList= GetScrollCourseTimeList(Group_Id)?.FirstOrDefault()?.TimeList ?? new List<CourseTimeModel>();
+            var dataList = plan_Appointment_DetailsRepository.GetPlanAppointmentStaticRepository(new RB_Plan_Appointment_Details_ViewModel()
+            {
+                QStartDate = startDate,
+                QEndDate = endDate,
+                Group_Id = Group_Id
+            });
+            for (var i = 0; i <= days; i++)
+            {
+                DateTime newDate = start.AddDays(i);
+                List<object> subTimeList = new List<object>();
+                foreach (var item in timeList)
+                {
+                    var tempDataList = dataList?.Where(qitem => qitem.Date == newDate && qitem.Status == 0 && qitem.StartTime == item.StartTime && qitem.EndTime == item.EndTime)?.ToList();
+                    subTimeList.Add(new
+                    {
+                        item.StartTime,
+                        item.EndTime,
+                        StuAppointNum = tempDataList?.Count() ?? 0,
+                        SubDate= Common.ConvertHelper.FormatDate(newDate),
+                        PlanAppointmentId= tempDataList?.FirstOrDefault()?.PlanAppointmentId??0
+                    });
+                }
+
+                var obj = new
+                {
+                    DateStr = Common.ConvertHelper.FormatDate(newDate),
+                    TimeList= subTimeList
+                };
+                list.Add(obj);
+            }
+            return list;
+        }
     }
 }

Edu.Repository/Scroll/RB_Plan_Appointment_DetailsRepository.cs

@@ -46,5 +46,39 @@ WHERE 1=1
             }
             return Get<RB_Plan_Appointment_Details_ViewModel>(builder.ToString()).ToList();
         }
+
+        /// <summary>
+        /// 获取学员预约列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Plan_Appointment_Details_ViewModel> GetPlanAppointmentStaticRepository(RB_Plan_Appointment_Details_ViewModel query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT  A.*,B.Date,B.StartTime,B.EndTime
+FROM RB_Plan_Appointment_Details AS A INNER JOIN RB_Plan_Appointment AS B ON A.PlanAppointmentId=B.Id
+WHERE 1=1  
+");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND B.{0}={1} ", nameof(RB_Plan_Appointment_ViewModel.Group_Id), query.Group_Id);
+                }
+                if (!string.IsNullOrEmpty(query.QStartDate))
+                {
+                    builder.AppendFormat(" AND B.Date>='{0}' ", query.QStartDate);
+                }
+
+                if (!string.IsNullOrEmpty(query.QEndDate))
+                {
+                    builder.AppendFormat(" AND B.Date<='{0} 23:59:59' ", query.QEndDate);
+                }
+
+            }
+            var list = Get<RB_Plan_Appointment_Details_ViewModel>(builder.ToString()).ToList();
+            return list;
+        }
     }
 }

Edu.WebApi/Controllers/Course/PlanAppoimentController.cs

@@ -68,6 +68,26 @@ namespace Edu.WebApi.Controllers.Course
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+        /// <summary>
+        /// 学员预约统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetPlanAppointmentStatic()
+        {
+            string startDate = base.ParmJObj.GetStringValue("StartTime");
+            string endDate = base.ParmJObj.GetStringValue("EndTime");
+            if (string.IsNullOrEmpty(startDate))
+            {
+                startDate = Common.ConvertHelper.FormatDate(DateTime.Now);
+            }
 
+            if (string.IsNullOrEmpty(endDate))
+            {
+                endDate = Common.ConvertHelper.FormatDate(Convert.ToDateTime(startDate).AddMonths(1));
+            }
+            var data = planAppoiment.GetPlanAppointmentStaticModule(startDate, endDate, base.UserInfo.Group_Id);
+            return ApiResult.Success(data: data);
+        }
     }
 }