111

Edu.Model/Entity/User/RB_Account.cs

@@ -73,7 +73,8 @@ namespace Edu.Model.Entity.User
         public DateStateEnum Status { get; set; }
 
         /// <summary>
-        /// 年假天数
+        /// 
+        /// 天数
         /// </summary>
         public double AnnualLeaveDay { get; set; }
 

Edu.Model/ViewModel/Query/StuCourseQuery.cs

@@ -29,5 +29,15 @@ namespace Edu.Model.ViewModel.Query
         /// 对应专业
         /// </summary>
         public CourseRateEnum CourseRate { get; set; }
+
+        /// <summary>
+        /// 学生编号
+        /// </summary>
+        public int Student_Id { get; set; }
+
+        /// <summary>
+        /// 状态(参考枚举)
+        /// </summary>
+        public GuestStateEnum GuestState { get; set; }
     }
 }

Edu.Module.Course/PlanAppoimentModule.cs

@@ -284,6 +284,16 @@ namespace Edu.Module.Course
                 QEndDate = endDate,
                 Group_Id = Group_Id
             });
+            List<RB_Plan_Appointment_Details_ViewModel> detailsList = new List<RB_Plan_Appointment_Details_ViewModel>();
+            if (dataList != null && dataList.Count > 0)
+            {
+                string ids = string.Join(",", dataList.Select(qitem => qitem.PlanAppointmentId));
+                detailsList = GetPlanAppointmentStatic(new Model.ViewModel.Scroll.RB_Plan_Appointment_Details_ViewModel()
+                {
+                    QPlanAppointmentIds = ids
+                });
+            }
+
             for (var i = 0; i <= days; i++)
             {
                 DateTime newDate = start.AddDays(i);
@@ -297,8 +307,20 @@ namespace Edu.Module.Course
                         item.EndTime,
                         item.Sort,
                         StuAppointNum = tempDataList?.Count() ?? 0,
-                        SubDate= Common.ConvertHelper.FormatDate(newDate),
-                        PlanAppointmentId= tempDataList?.FirstOrDefault()?.PlanAppointmentId??0
+                        SubDate = Common.ConvertHelper.FormatDate(newDate),
+                        PlanAppointmentId = tempDataList?.FirstOrDefault()?.PlanAppointmentId ?? 0,
+                        StuList = detailsList?.Where(qitem => qitem.PlanAppointmentId == (tempDataList?.FirstOrDefault()?.PlanAppointmentId ?? 0))
+                        ?.Select(qitem => new
+                        {
+                            qitem.StuId,
+                            qitem.StuName,
+                            qitem.StartTime,
+                            qitem.EndTime,
+                            DateStr = Common.ConvertHelper.FormatDate(qitem.Date),
+                            CreateTime = Common.ConvertHelper.FormatTime(qitem.CreateTime),
+                            qitem.Status,
+                            StatusStr = qitem.Status == 0 ? "正常" : "取消"
+                        })
                     });
                 }
 

Edu.Module.Course/ScrollClassModule.cs

@@ -3551,16 +3551,29 @@ namespace Edu.Module.Course
                 AssistId = demodel.TeacherAccountId,
                 CourseId = demodel.CourseId,
                 CourseRate = demodel.CourseRate,
+                Student_Id=demodel.Student_Id,
+                StuGuestState=demodel.GuestState,
+
             });
             if (dataList.Any())
             {
                 //获取所有的订单信息
                 string orderIds = string.Join(",", dataList.Select(x => x.OrderId).Distinct());
+                string guestIds = string.Join(",", dataList.Select(x => x.GuestId).Distinct());
                 var orderList = orderRepository.GetOrderListRepository(new RB_Order_ViewModel() { Group_Id = demodel.Group_Id, QOrderIds = orderIds });
                 //查询订单Guest
-                var orderGuestList = order_GuestRepository.GetSingleListRepository(new RB_Order_Guest_ViewModel() { Group_Id = demodel.Group_Id, OrderIds = orderIds });
+                var orderGuestList = order_GuestRepository.GetSingleListRepository(new RB_Order_Guest_ViewModel()
+                {
+                    Group_Id = demodel.Group_Id,
+                    OrderIds = orderIds,
+                    OrderGuestIds = guestIds
+                });
                 //根据学生 查询所有的约课数据
-                var AppointList = scroll_AppointmentRepository.GetAppointList(new RB_Scroll_Appointment_ViewModel() { Group_Id = demodel.Group_Id });
+                var AppointList = scroll_AppointmentRepository.GetAppointList(new RB_Scroll_Appointment_ViewModel()
+                {
+                    Group_Id = demodel.Group_Id,
+                    StuId = demodel.Student_Id
+                });
                 //查询所有的 补课记录
                 var SkipList = scroll_SkipCourseRepository.GetList(new RB_Scroll_SkipCourse_ViewModel() { Group_Id = demodel.Group_Id });
                 string courseIds = string.Join(",", dataList.Select(qitem => qitem.CourseId).Distinct());

Edu.Repository/Sell/RB_Order_GuestRepository.cs

@@ -324,6 +324,10 @@ WHERE 1=1 AND A.Status=0
             {
                 where += $@" AND {nameof(RB_Order_Guest_ViewModel.GuestState)} ={(int)demodel.GuestState}";
             }
+            if (!string.IsNullOrEmpty(demodel.OrderGuestIds))
+            {
+                where += $@" AND {nameof(RB_Order_Guest_ViewModel.Id)} in({demodel.OrderGuestIds})";
+            }
             string sql = $@" SELECT * FROM RB_Order_Guest WHERE {where}";
             return Get<RB_Order_Guest_ViewModel>(sql).ToList();
         }

Edu.Repository/User/RB_Student_OrderGuestRepository.cs

@@ -80,6 +80,11 @@ WHERE 1=1 AND C.OrderState IN(1) AND D.Status=0
                 {
                     builder.AppendFormat(" AND EXISTS(SELECT 1 FROM rb_course_chapter WHERE `Status`=0  AND CourseId=C.CourseId AND CourseRate IN({0}))",(int)query.CourseRate);
                 }
+                //学员状态
+                if (query.StuGuestState > 0)
+                {
+                    builder.AppendFormat(@" AND D.GuestState IN({0}) ", (int)query.StuGuestState);
+                }
             }
             return Get<RB_Student_OrderGuest_ViewModel>(builder.ToString()).ToList();
         }
@@ -856,7 +861,7 @@ LEFT JOIN (
 INNER JOIN rb_student s1 on ss1.StuId = s1.StuId
 WHERE ss1.`Status` =0 and ss1.State =1 and ss1.Group_Id ={group_Id} and s1.StuName LIKE '%{stuName}%' and ss1.CourseGradeId ={CourseGradeId} and ss1.CourseGradeNo ={NextChapterGradeNo} GROUP BY ss1.StuId
 ) ss on sog.Student_Id = ss.StuId
-WHERE o.Group_Id ={group_Id} and sog.`Status` =0 and og.GuestState <>2 and o.OrderState <>3 and c.ClassScrollType =2 and s.StuName LIKE '%{stuName}%'";
+WHERE o.Group_Id ={group_Id} and sog.`Status` =0 and og.GuestState NOT IN(2,7) and o.OrderState <>3 and c.ClassScrollType =2 and s.StuName LIKE '%{stuName}%'";
             if (SchoolId >= 0)
             {
                 sql += $@" and o.ScrollSchoolId ={SchoolId}";

Edu.WebApi/Controllers/Course/PlanAppoimentController.cs

@@ -85,6 +85,7 @@ namespace Edu.WebApi.Controllers.Course
             {
                 endDate = Common.ConvertHelper.FormatDate(Convert.ToDateTime(startDate).AddMonths(1));
             }
+
             var data = planAppoiment.GetPlanAppointmentStaticModule(startDate, endDate, base.UserInfo.Group_Id);
             return ApiResult.Success(data: data);
         }

Edu.WebApi/Controllers/Course/ScrollController.cs

@@ -1092,12 +1092,11 @@ namespace Edu.WebApi.Controllers.Course
             {
                 TeacherAccountId=base.ParmJObj.GetInt("TeacherAccountId"),
                 CourseId=base.ParmJObj.GetInt("CourseId"),
-                CourseRate=(CourseRateEnum)base.ParmJObj.GetInt("CourseRate")
+                CourseRate=(CourseRateEnum)base.ParmJObj.GetInt("CourseRate"),
+                Student_Id=base.ParmJObj.GetInt("Student_Id"),
+                GuestState=(GuestStateEnum)base.ParmJObj.GetInt("GuestState")
             };
-            //if (demodel.StuId <= 0)
-            //{
-            //    return ApiResult.ParamIsNull("请传递学生ID");
-            //}
+ 
             demodel.Group_Id = userInfo.Group_Id;
 
             var list = scrollClassModule.GetStuLearnChapterStaticModule(demodel, out int MaxLength);