提交代码

Edu.Model/Entity/Course/RB_Class_LessonComment.cs

@@ -10,10 +10,10 @@ namespace Edu.Model.Entity.Course
     [Serializable]
     [DB(ConnectionName = "DefaultConnection")]
     public class RB_Class_LessonComment
-    { 
+    {
         /// <summary>
-       /// 教案评论id
-       /// </summary>
+        /// 教案评论id
+        /// </summary>
         public int LessonCommentId { get; set; }
 
         /// <summary>
@@ -61,5 +61,11 @@ namespace Edu.Model.Entity.Course
         /// 删除状态(0-正常,1-禁用)
         /// </summary>
         public DateStateEnum Status { get; set; }
+
+
+        /// <summary>
+        /// 班级上课的时间
+        /// </summary>
+        public DateTime? ClassDate { get; set; }
     }
 }

Edu.Model/Entity/Course/RB_Class_LessonPlan.cs

@@ -104,5 +104,10 @@ namespace Edu.Model.Entity.Course
         /// 教案图片
         /// </summary>
         public string ProjectPic { get; set; }
+
+        /// <summary>
+        /// 上课时间
+        /// </summary>
+        public DateTime? ClassDate { get; set; }
     }
 }

Edu.Model/Entity/Course/RB_Class_Plan.cs

@@ -61,5 +61,10 @@ namespace Edu.Model.Entity.Course
         /// 0-未反馈，1-已反馈
         /// </summary>
         public int FanKuiStatus { get; set; }
+
+        /// <summary>
+        /// 0-未反馈，1-已反馈
+        /// </summary>
+        public int ParentFanKuiStatus { get; set; }
     }
 }
\ No newline at end of file

Edu.Model/Entity/Course/RB_Order_Guest.cs

@@ -32,7 +32,7 @@ namespace Edu.Model.Entity.Course
         public string GuestName { get; set; }
 
         /// <summary>
-        /// 状态  1正常  2退学 3-申请中，4-驳回申请,5-停课，6-停课申请中
+        /// 状态  1正常  2退学 3-申请中，4-驳回申请,5-停课，6-停课申请中，7-完结的订单
         /// </summary>
         public int GuestState { get; set; }
 
@@ -195,5 +195,10 @@ namespace Edu.Model.Entity.Course
         /// 学生头像
         /// </summary>
         public string StuIcon { get; set; }
+
+        /// <summary>
+        /// 变更生效时间
+        /// </summary>
+        public DateTime? ChangeEffectTime { get; set; }
     }
 }

Edu.Model/ViewModel/Course/Class_LessonPlan_ViewModel.cs

@@ -96,6 +96,11 @@ namespace Edu.Model.ViewModel.Course
         /// </summary>
         public int FanKuiStatus { get; set; }
 
+        /// <summary>
+        /// 0-未反馈，1-已反馈
+        /// </summary>
+        public int ParentFanKuiStatus { get; set; }
+
         /// <summary>
         /// 总评分
         /// </summary>

Edu.Module.Course/ClassModule.cs

@@ -1271,7 +1271,7 @@ namespace Edu.Module.Course
             {
                 checkList = GetClassCheckList(new RB_Class_Check_ViewModel { Group_Id = group_Id, ClassId = classId, ClassTimeId = ClassTimeId });
                 var classTimeModel = class_TimeRepository.GetClassTimeList_V2(new RB_Class_Time_ViewModel { ClassTimeId = ClassTimeId, Group_Id = group_Id }).FirstOrDefault();
-                orderStudentList = orderStudentList.Where(x => x.GuestState == 1 || x.GuestState == 6 || (x.GuestState == 5 && x.StopClassEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.StopClassEffectTime)) >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(classTimeModel.NewPlanDateTime)))).ToList();
+                orderStudentList = orderStudentList.Where(x => x.GuestState == 1 || x.GuestState == 6 || ((x.GuestState == 5 || x.GuestState == 7) && x.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.ChangeEffectTime)) >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(classTimeModel.NewPlanDateTime)))).ToList();
             }
             if (orderStudentList != null && orderStudentList.Count > 0)
             {
@@ -2078,7 +2078,7 @@ namespace Edu.Module.Course
                 string Ids = string.Join(",", planList.Select(qitem => qitem.ClassPlanId));
                 if (!string.IsNullOrEmpty(Ids))
                 {
-                    timeList = class_TimeRepository.GetClassTimeListRepository(new RB_Class_Time_ViewModel() { QClassPlanIds = Ids });
+                    timeList = class_TimeRepository.GetClassTimeList_V2(new RB_Class_Time_ViewModel() { QClassPlanIds = Ids });
                 }
                 string ClassIds = string.Join(",", planList.GroupBy(x => x.ClassId).Select(x => x.Key));
                 var orderStudentList = order_GuestRepository.GetOrderGuestListRepository(new RB_Order_Guest_ViewModel()
@@ -2098,12 +2098,12 @@ namespace Edu.Module.Course
                 foreach (var item in planList)
                 {
                     item.PlanTimeList = new List<RB_Class_Time_ViewModel>();
-                    item.PlanTimeList = timeList.Where(x => x.ClassPlanId == item.ClassPlanId).ToList();
+                    item.PlanTimeList = timeList.Where(x => x.ClassId == item.ClassId &&(x.ClassPlanId == item.ClassPlanId || item.ClassDate == Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.NewPlanDateTime)))).ToList();
 
                     foreach (var itemTime in item.PlanTimeList)
                     {
                         itemTime.GuestList = new List<RB_Order_Guest_ViewModel>();
-                        itemTime.GuestList = orderStudentList.Where(x => x.ClassId == itemTime.ClassId && (x.GuestState == 1 || x.GuestState == 6 || (x.GuestState == 5 && x.StopClassEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.StopClassEffectTime)) >= item.ClassDate))).ToList();
+                        itemTime.GuestList = orderStudentList.Where(x => x.ClassId == itemTime.ClassId && (x.GuestState == 1 || x.GuestState == 6 || ((x.GuestState == 5 || x.GuestState == 7) && x.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.ChangeEffectTime)) >= item.ClassDate))).ToList();
                         foreach (var itemCheck in itemTime.GuestList)
                         {
                             //0-正常，1-缺勤，2-未签到
@@ -2134,22 +2134,49 @@ namespace Edu.Module.Course
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
+        [TransactionCallHandler]
         public bool SetLessonComment(RB_Class_LessonComment_ViewModel model)
         {
+            bool flag = false;
             if (model.LessonCommentId == 0)
             {
-                return classLessonCommentRepository.Insert(model) > 0;
+                flag = classLessonCommentRepository.Insert(model) > 0;
+                if (flag && model.Score > 0)
+                {
+                    Dictionary<string, object> fileds = new Dictionary<string, object>()
+                    {
+                        {nameof(RB_Class_Plan.ParentFanKuiStatus),1}
+                    };
+                    class_PlanRepository.Update(fileds, new WhereHelper(nameof(RB_Class_Plan.ClassPlanId), model.ClassPlanId));
+                }
             }
             else
             {
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
                 {
-                    {nameof(RB_Class_LessonComment_ViewModel.Status),1}
+                    {nameof(RB_Class_LessonComment_ViewModel.Score),model.Score},
+                     {nameof(RB_Class_LessonComment_ViewModel.Comment),model.Comment}
                 };
-                return classLessonCommentRepository.Update(fileds, new WhereHelper(nameof(RB_Class_LessonComment_ViewModel.LessonCommentId), model.LessonCommentId));
+                flag = classLessonCommentRepository.Update(fileds, new WhereHelper(nameof(RB_Class_LessonComment_ViewModel.LessonCommentId), model.LessonCommentId));
             }
+            return flag;
         }
+        /// <summary>
+        /// 评论/删除评论
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool DelLessonComment(RB_Class_LessonComment_ViewModel model)
+        {
+           
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    {nameof(RB_Class_LessonComment_ViewModel.Status),1}
+                };
+            return classLessonCommentRepository.Update(fileds, new WhereHelper(nameof(RB_Class_LessonComment_ViewModel.LessonCommentId), model.LessonCommentId));
 
+          
+        }
         #endregion
 
         #region 根据学生id获取最近的上课信息
@@ -2558,7 +2585,7 @@ namespace Edu.Module.Course
                             TimeStr = Common.ConvertHelper.GetTimeStr(currentDate),
                             StartTime = tempTimeList?.FirstOrDefault()?.StartTime ?? "",
                             EndTime = tempTimeList?.LastOrDefault()?.EndTime ?? "",
-                            GuestList = guestList.Where(qitem => qitem.ClassId == subItem.ClassId && (qitem.GuestState == 1 || qitem.GuestState == 6 || (qitem.GuestState == 5 && qitem.StopClassEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(qitem.StopClassEffectTime)) >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(ClassDate)))))?.Select(qitem => new { qitem.GuestName })
+                            GuestList = guestList.Where(qitem => qitem.ClassId == subItem.ClassId && (qitem.GuestState == 1 || qitem.GuestState == 6 || ((qitem.GuestState == 5 || qitem.GuestState == 7) && qitem.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(qitem.ChangeEffectTime)) >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(ClassDate)))))?.Select(qitem => new { qitem.GuestName })
                         });
                     }
 
@@ -2777,7 +2804,7 @@ namespace Edu.Module.Course
                                 TimeStr = Common.ConvertHelper.GetTimeStr(currentDate),
                                 StartTime = item?.StartTime ?? "",
                                 EndTime = item?.EndTime ?? "",
-                                GuestList = guestList.Where(qitem => qitem.ClassId == subItem.ClassId && (qitem.GuestState == 1 || qitem.GuestState == 6 || (qitem.GuestState == 5 && qitem.StopClassEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(qitem.StopClassEffectTime)) >= subItem.ClassDate)))?.Select(qitem => new { qitem.GuestName }),
+                                GuestList = guestList.Where(qitem => qitem.ClassId == subItem.ClassId && (qitem.GuestState == 1 || qitem.GuestState == 6 || ((qitem.GuestState == 5 || qitem.GuestState == 7) && qitem.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(qitem.ChangeEffectTime)) >= subItem.ClassDate)))?.Select(qitem => new { qitem.GuestName }),
                                 Type = 0,// 0-班级，1-使用记录，2-异常记录
                             });
                         }
@@ -2938,7 +2965,7 @@ namespace Edu.Module.Course
                                 TimeStr = Common.ConvertHelper.GetTimeStr(currentDate),
                                 StartTime = item?.StartTime ?? "",
                                 EndTime = item?.EndTime ?? "",
-                                GuestList = guestList.Where(qitem => qitem.ClassId == subItem.ClassId && (qitem.GuestState == 1 || qitem.GuestState == 6 || (qitem.GuestState == 5 && qitem.StopClassEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(qitem.StopClassEffectTime)) >= subItem.ClassDate)))?.Select(qitem => new { qitem.GuestName })
+                                GuestList = guestList.Where(qitem => qitem.ClassId == subItem.ClassId && (qitem.GuestState == 1 || qitem.GuestState == 6 || ((qitem.GuestState == 5 || qitem.GuestState == 7) && qitem.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(qitem.ChangeEffectTime)) >= subItem.ClassDate)))?.Select(qitem => new { qitem.GuestName })
 
                             });
                         }
@@ -3054,7 +3081,7 @@ namespace Edu.Module.Course
                         TimeStr = Common.ConvertHelper.GetTimeStr(currentDate),
                         StartTime = item?.StartTime ?? "",
                         EndTime = item?.EndTime ?? "",
-                        GuestList = item.ClassType == 1 ? guestList.Where(qitem => qitem.ClassId == item.ClassId && (qitem.GuestState == 1 || qitem.GuestState == 6 || (qitem.GuestState == 5 && qitem.StopClassEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(qitem.StopClassEffectTime)) >= item.ClassDate)))?.Select(qitem => new { qitem.GuestName }) : visitorList?.Where(qitem => qitem.ReserveClassId == item.ClassTimeId)?.Select(qitem => new { GuestName = qitem.VisitorName }),
+                        GuestList = item.ClassType == 1 ? guestList.Where(qitem => qitem.ClassId == item.ClassId && (qitem.GuestState == 1 || qitem.GuestState == 6 || ((qitem.GuestState == 5 || qitem.GuestState == 7) && qitem.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(qitem.ChangeEffectTime)) >= item.ClassDate)))?.Select(qitem => new { qitem.GuestName }) : visitorList?.Where(qitem => qitem.ReserveClassId == item.ClassTimeId)?.Select(qitem => new { GuestName = qitem.VisitorName }),
 
                     });
                 }
@@ -3195,6 +3222,23 @@ namespace Edu.Module.Course
             return orderstudentList;
 
         }
+
+        /// <summary>
+        /// 获取非本班学员的学员
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <returns></returns>
+        public List<RB_Order_Guest_ViewModel> GetNotClassStudentList(RB_Order_Guest_ViewModel demodel)
+        {
+            var orderstudentList = order_GuestRepository.GetNotClassStudentList(demodel);
+
+            return orderstudentList;
+
+        }
+
+
+
+
         #endregion
 
 

Edu.Module.EduTask/StopStudentClassModule.cs

@@ -47,14 +47,14 @@ namespace Edu.Module.EduTask
         /// <returns></returns>
         public bool UpdateAuditThroughStudent()
         {
-            var list = order_GuestRepository.GetOrderGuestListRepository(new Model.ViewModel.Course.RB_Order_Guest_ViewModel { GuestState = 6 });
+            var list = order_GuestRepository.GetOrderStopClassing(new Model.ViewModel.Course.RB_Order_Guest_ViewModel { GuestState = 6 });
             foreach (var item in list.Where(x => x.StopClassEffectTime.HasValue && x.StopClassEffectTime < System.DateTime.Now))
             {
                 //将学员的学习状态变成停课申请中
-
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
                 {
                     {nameof(RB_Order_Guest.GuestState),5},
+                    {nameof(RB_Order_Guest.ChangeEffectTime),item.StopClassEffectTime},
                     {nameof(RB_Order_Guest.UpdateTime),System.DateTime.Now},
                 };
                 order_GuestRepository.Update(fileds, new WhereHelper(nameof(RB_Order_Guest.Id), item.Id));

Edu.Repository/Course/RB_Class_LessonCommentRepository.cs

@@ -38,7 +38,11 @@ namespace Edu.Repository.Course
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_LessonComment_ViewModel.ClassId), query.ClassId);
                 }
-                if (query.ClassPlanId > 0)
+                if (query.ClassPlanId > 0 && query.ClassDate.HasValue)
+                {
+                    builder.AppendFormat(" AND ({0}={1}   or DATE_FORMAT({2},'%y/%m/%d')= DATE_FORMAT('{3}','%y/%m/%d'))", nameof(RB_Class_LessonComment_ViewModel.ClassPlanId), query.ClassPlanId, nameof(RB_Class_LessonComment_ViewModel.ClassDate), query.ClassDate.Value);
+                }
+                else if (query.ClassPlanId > 0)
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_LessonComment_ViewModel.ClassPlanId), query.ClassPlanId);
                 }
@@ -46,6 +50,10 @@ namespace Edu.Repository.Course
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_LessonComment_ViewModel.LessonPlanId), query.LessonPlanId);
                 }
+                if (query.LessonCommentId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_LessonComment_ViewModel.LessonCommentId), query.LessonCommentId);
+                }
                 if (query.CreateBy > 0)
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_LessonComment_ViewModel.CreateBy), query.CreateBy);

Edu.Repository/Course/RB_Class_LessonPlanRepository.cs

@@ -81,10 +81,15 @@ namespace Edu.Repository.Course
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_LessonPlan.ClassId), query.ClassId);
                 }
-                if (query.ClassPlanId > 0)
+                if (query.ClassPlanId > 0 && query.ClassDate.HasValue)
+                {
+                    builder.AppendFormat(" AND ({0}={1}   or DATE_FORMAT({2},'%y/%m/%d')= DATE_FORMAT('{3}','%y/%m/%d'))", nameof(RB_Class_LessonPlan.ClassPlanId), query.ClassPlanId, nameof(RB_Class_LessonPlan.ClassDate), query.ClassDate.Value);
+                }
+                else if (query.ClassPlanId > 0)
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_LessonPlan.ClassPlanId), query.ClassPlanId);
                 }
+
                 if (query.IsTemplate > -1)
                 {
                     builder.AppendFormat(" AND {0}={1} ", nameof(RB_Class_LessonPlan.IsTemplate), query.IsTemplate);

Edu.Repository/Course/RB_Class_TimeRepository.cs

@@ -73,7 +73,7 @@ WHERE 1=1
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
 SELECT  B.*,CONCAT( DATE_FORMAT(A.ClassDate,'%Y-%m-%d') ,' ',B.StartTime,':00') AS NewPlanDateTime,
-CONCAT( DATE_FORMAT(A.ClassDate,'%Y-%m-%d') ,' ',B.EndTime,':00') AS NewEndPlanDateTime
+CONCAT( DATE_FORMAT(A.ClassDate,'%Y-%m-%d') ,' ',B.EndTime,':00') AS NewEndPlanDateTime,TIMESTAMPDIFF(MINUTE,(DATE_FORMAT(CONCAT('2021-01-01 ',B.StartTime,':00'),'%Y-%m-%d %H:%i')),(DATE_FORMAT(CONCAT('2021-01-01 ',B.EndTime,':00'), '%Y-%m-%d %H:%i'))) AS TimeMinute
 FROM rb_class_time AS B INNER JOIN rb_class_plan AS A ON A.ClassPlanId=B.ClassPlanId WHERE 1=1
 ");
             if (query != null)

Edu.Repository/Course/RB_Order_GuestRepository.cs

@@ -26,10 +26,6 @@ namespace Edu.Repository.Course
             {
                 where += $@" and A.{nameof(RB_Order_Guest_ViewModel.Group_Id)} ={demodel.Group_Id}";
             }
-            //if (demodel.School_Id > 0)
-            //{
-            //    where += $@" and A.{nameof(RB_Order_Guest_ViewModel.School_Id)} ={demodel.School_Id}";
-            //}
             if (demodel.Id > 0)
             {
                 where += $@" and A.{nameof(RB_Order_Guest_ViewModel.Id)} ={demodel.Id}";
@@ -65,11 +61,9 @@ namespace Edu.Repository.Course
 
             string sql = $@" 
 SELECT A.*,IFNULL(B.IsChaBan,0) AS IsChaBan,IFNULL(B.StartClassHours,0) AS StartClassHours,IFNULL(C.CourseName,'') AS CourseName
-       ,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId,B.IsRenewOrder,B.RenewOrderId,sc.StopClassEffectTime
+       ,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId,B.IsRenewOrder,B.RenewOrderId
 FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
-     LEFT JOIN rb_course AS C ON (B.CourseId=C.CourseId AND B.CourseId>0 AND B.OrderType=1)
-LEFT JOIN (SELECT OrderGuestId,MAX(TakeEffectTime) as StopClassEffectTime from rb_student_stopclass where IsAuditThrough=1 GROUP BY OrderGuestId) as sc on sc.OrderGuestId=a.Id
-WHERE {where}";
+     LEFT JOIN rb_course AS C ON (B.CourseId=C.CourseId AND B.CourseId>0 AND B.OrderType=1) WHERE {where}";
             return Get<RB_Order_Guest_ViewModel>(sql).ToList();
         }
 
@@ -321,7 +315,7 @@ WHERE  1=1 and A.Status=0 and class.Status=0   and b.OrderState<>3
         /// <param name="demodel"></param>
         /// <param name="orderIds"></param>
         /// <returns></returns>
-        public List<RB_Order_Guest_ViewModel> GetStopingStudentPage( RB_Order_Guest_ViewModel demodel)
+        public List<RB_Order_Guest_ViewModel> GetStopingStudentPage(RB_Order_Guest_ViewModel demodel)
         {
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
@@ -383,5 +377,138 @@ WHERE  1=1 and A.Status=0   and class.Status=0  and b.OrderState<>3  ");
             builder.AppendFormat($@" order by A.{nameof(RB_Order_Guest_ViewModel.Id)} desc");
             return Get<RB_Order_Guest_ViewModel>(builder.ToString()).ToList();
         }
+
+
+
+        /// <summary>
+        /// 获取分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="demodel"></param>
+        /// <param name="orderIds"></param>
+        /// <returns></returns>
+        public List<RB_Order_Guest_ViewModel> GetNotClassStudentList(RB_Order_Guest_ViewModel demodel)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.IsChaBan,0) AS IsChaBan,IFNULL(B.StartClassHours,0) AS StartClassHours,school.SName as SchoolName,teacher.TeacherName,IFNULL(C.CourseName,'') AS CourseName,class.ClassNo,class.ClassName,b.EnterID
+      ,plan.TotalPlanNum,planr.Ranks ,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId,B.IsRenewOrder,B.RenewOrderId
+FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
+LEFT JOIN rb_class as class on class.ClassId=a.ClassId
+     LEFT JOIN rb_course AS C ON (B.CourseId=C.CourseId AND B.CourseId>0 AND B.OrderType=1)
+LEFT JOIN (SELECT ClassId,COUNT(*) TotalPlanNum from rb_class_plan where `Status`=0 GROUP BY ClassId) as plan on plan.ClassId=class.ClassId
+LEFT JOIN (SELECT ClassId,COUNT(*) Ranks from rb_class_plan where `Status`=0 and DATE_FORMAT(ClassDate,'%Y-%m-%d') <=DATE_FORMAT(NOW(),'%Y-%m-%d') GROUP BY ClassId) as planr on planr.ClassId=class.ClassId
+LEFT JOIN rb_teacher as teacher on teacher.TId=class.Teacher_Id
+LEFT JOIN rb_school as school on school.SId=class.School_Id
+WHERE  1=1 and A.Status=0   and class.Status=0  and b.OrderState<>3  and a.GuestState in(1,6)  ");
+            if (demodel.Group_Id > 0)
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.Group_Id)} ={demodel.Group_Id}");
+            }
+            if (demodel.School_Id > 0)
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.School_Id)} ={demodel.School_Id}");
+            }
+            if (demodel.OrderId > 0)
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.OrderId)} ={demodel.OrderId}");
+            }
+            if (demodel.Teacher_Id > 0)
+            {
+                builder.AppendFormat($@" and class.Teacher_Id ={demodel.Teacher_Id}");
+            }
+            if (!string.IsNullOrEmpty(demodel.GuestName))
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.GuestName)} like '%{demodel.GuestName}%'");
+            }
+            if (demodel.ClassId > 0)
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.ClassId)} !={demodel.ClassId}");
+            }
+            if (demodel.CourseId > 0)
+            {
+                builder.AppendFormat($@" AND B.{nameof(RB_Order_Guest_ViewModel.CourseId)} ={demodel.CourseId}");
+            }
+            if (demodel.EnterID > 0)
+            {
+                builder.AppendFormat($@" AND B.{nameof(RB_Order_Guest_ViewModel.EnterID)} ={demodel.EnterID}");
+            }
+            if (demodel.SourceId > 0)
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.SourceId)} ={demodel.SourceId}");
+            }
+            if (!string.IsNullOrWhiteSpace(demodel.OrderGuestIds))
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.Id)}  in ({demodel.OrderGuestIds})");
+            }
+            if (demodel.GuestState > 0)
+            {
+                builder.AppendFormat($@" AND A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}");
+            }
+            builder.AppendFormat($@" order by A.{nameof(RB_Order_Guest_ViewModel.Id)} desc");
+            return Get<RB_Order_Guest_ViewModel>(builder.ToString()).ToList();
+        }
+
+
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="demodel"></param>
+        /// <param name="orderIds"></param>
+        /// <returns></returns>
+        public List<RB_Order_Guest_ViewModel> GetOrderStopClassing(RB_Order_Guest_ViewModel demodel)
+        {
+            string where = $@" 1=1 and A.Status=0 ";
+            if (demodel.Group_Id > 0)
+            {
+                where += $@" and A.{nameof(RB_Order_Guest_ViewModel.Group_Id)} ={demodel.Group_Id}";
+            }
+           
+            if (demodel.Id > 0)
+            {
+                where += $@" and A.{nameof(RB_Order_Guest_ViewModel.Id)} ={demodel.Id}";
+            }
+            if (demodel.OrderId > 0)
+            {
+                where += $@" and A.{nameof(RB_Order_Guest_ViewModel.OrderId)} ={demodel.OrderId}";
+            }
+            if (demodel.ClassId > 0)
+            {
+                where += $@" and A.{nameof(RB_Order_Guest_ViewModel.ClassId)} ={demodel.ClassId}";
+            }
+            if (!string.IsNullOrEmpty(demodel.OrderIds))
+            {
+                where += $@" and A.{nameof(RB_Order_Guest_ViewModel.OrderId)} in({demodel.OrderIds})";
+            }
+            if (!string.IsNullOrEmpty(demodel.ClassIds))
+            {
+                where += $@" and A.{nameof(RB_Order_Guest_ViewModel.ClassId)} in({demodel.ClassIds})";
+            }
+            if (!string.IsNullOrEmpty(demodel.GuestName))
+            {
+                where += $@" and A.{nameof(RB_Order_Guest_ViewModel.GuestName)} like '%{demodel.GuestName}%'";
+            }
+            if (demodel.GuestState > 0)
+            {
+                where += $@" and A.{nameof(RB_Order_Guest_ViewModel.GuestState)} ={demodel.GuestState}";
+            }
+            if (demodel.QEffectStatus == 1)
+            {
+                where += $@" AND (B.IsChaBan=0 OR (B.IsChaBan=1 AND B.EffectStatus IN(1) )) ";
+            }
+
+            string sql = $@" 
+SELECT A.*,IFNULL(B.IsChaBan,0) AS IsChaBan,IFNULL(B.StartClassHours,0) AS StartClassHours,IFNULL(C.CourseName,'') AS CourseName
+       ,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId,B.IsRenewOrder,B.RenewOrderId,sc.StopClassEffectTime
+FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
+     LEFT JOIN rb_course AS C ON (B.CourseId=C.CourseId AND B.CourseId>0 AND B.OrderType=1)
+LEFT JOIN (SELECT OrderGuestId,MAX(TakeEffectTime) as StopClassEffectTime from rb_student_stopclass where IsAuditThrough=1 GROUP BY OrderGuestId) as sc on sc.OrderGuestId=a.Id
+WHERE {where}";
+            return Get<RB_Order_Guest_ViewModel>(sql).ToList();
+        }
+
     }
 }

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -769,7 +769,7 @@ namespace Edu.WebApi.Controllers.Course
                 ClassTimeId = ClassTimeId,
             });
             List<object> guestList = new List<object>();
-            foreach (var item in orderGuestList.Where(x => x.GuestState == 1 || x.GuestState == 6 || (x.GuestState == 5 && x.StopClassEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.StopClassEffectTime)) >= data.ClassDate)))
+            foreach (var item in orderGuestList.Where(x => x.GuestState == 1 || x.GuestState == 6 || ((x.GuestState == 5 || x.GuestState == 7) && x.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.ChangeEffectTime)) >= data.ClassDate)))
             {
                 if (item.IsChaBan == 0 || (item.IsChaBan == 1 && data.ClassDate >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(item.EffectTime))))
                 {
@@ -1296,6 +1296,7 @@ namespace Edu.WebApi.Controllers.Course
                 School_Id = base.ParmJObj.GetInt("School_Id"),
                 IsTemplate = -1
             };
+
             Class_LessonPlan_ViewModel model = new Class_LessonPlan_ViewModel();
             //获取班级上课新以及老师名称
             var planDate = classModule.GetClassPlanListModule(new RB_Class_Plan_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = extModel.ClassId, ClassPlanId = extModel.ClassPlanId }).FirstOrDefault();
@@ -1308,18 +1309,8 @@ namespace Edu.WebApi.Controllers.Course
             model.WorkDate = planDate.ClassDate.ToString("yyyy年MM月dd日");
             model.BeiKeStatus = planDate.BeiKeStatus;
             model.FanKuiStatus = planDate.FanKuiStatus;
-            #region 查询备课评分信息
-            var query = new RB_Class_LessonComment_ViewModel()
-            {
-                ClassPlanId = base.ParmJObj.GetInt("ClassPlanId"),
-                ClassId = base.ParmJObj.GetInt("ClassId"),
-                Group_Id = base.UserInfo.Group_Id,
-                //School_Id = base.ParmJObj.GetInt("School_Id"),
-            };
-            query.Group_Id = base.UserInfo.Group_Id;
-            var list = classModule.GetLessonCommentList(query);
-            model.TotalScore = (list != null && list.Any()) ? list.Where(x => x.Score > 0).Sum(x => x.Score) : 0;
-            #endregion
+            model.ParentFanKuiStatus = planDate.ParentFanKuiStatus;
+
 
             model.WeekStr = StringHelper.GetJapanWeekChar(planDate.ClassDate);
             DateTime startTime = System.DateTime.Now;
@@ -1344,7 +1335,25 @@ namespace Edu.WebApi.Controllers.Course
                 model.ClassStartTime = planTiemList.Min(x => Convert.ToDateTime(x.NewPlanDateTime)).ToString("yyyy-MM-dd HH:mm:00");
                 model.ClassEndTime = planTiemList.Max(x => Convert.ToDateTime(x.NewEndPlanDateTime)).ToString("yyyy-MM-dd HH:mm:00");
             }
+            extModel.ClassDate = planDate.ClassDate;
             var lessonPlanList = classModule.GetLessonPlanListRepository(extModel);
+
+            #region 查询备课评分信息
+            if (lessonPlanList != null && lessonPlanList.Any())
+            {
+                lessonPlanList.ForEach(x => x.ClassPlanId = planDate.ClassPlanId);
+                var query = new RB_Class_LessonComment_ViewModel()
+                {
+                    ClassId = base.ParmJObj.GetInt("ClassId"),
+                    Group_Id = base.UserInfo.Group_Id,
+                    ClassPlanId = base.ParmJObj.GetInt("ClassPlanId"),
+                };
+                query.Group_Id = base.UserInfo.Group_Id;
+                query.ClassDate = planDate.ClassDate;
+                var list = classModule.GetLessonCommentList(query);
+                model.TotalScore = (list != null && list.Any()) ? list.Where(x => x.Score > 0).Sum(x => x.Score) : 0;
+            }
+            #endregion
             model.ClassId = extModel.ClassId;
             model.ClassPlanId = extModel.ClassPlanId;
             model.School_Id = extModel.School_Id;
@@ -1736,11 +1745,11 @@ namespace Edu.WebApi.Controllers.Course
                         foreach (var itemTime in item.PlanTimeList)
                         {
                             int IsPlanLessonStatus = 0;//0-未备课，1-部分，2-全部
-                            if (plan.Where(x => x.BeiKeStatus > 0 && x.ClassPlanId == itemTime.ClassPlanId).Count() < plan.Where(x => x.ClassPlanId == itemTime.ClassPlanId).Count() && plan.Where(x => x.BeiKeStatus > 0 && x.ClassPlanId == itemTime.ClassPlanId).Count() > 0)
+                            if (plan.Where(x => x.BeiKeStatus > 0 && (x.ClassPlanId == itemTime.ClassPlanId || x.ClassDate == Convert.ToDateTime(Common.ConvertHelper.FormatDate(itemTime.NewPlanDateTime)))).Count() < plan.Where(x => (x.ClassPlanId == itemTime.ClassPlanId || x.ClassDate == Convert.ToDateTime(Common.ConvertHelper.FormatDate(itemTime.NewPlanDateTime)))).Count() && plan.Where(x => x.BeiKeStatus > 0 && (x.ClassPlanId == itemTime.ClassPlanId || x.ClassDate == Convert.ToDateTime(Common.ConvertHelper.FormatDate(itemTime.NewPlanDateTime)))).Count() > 0)
                             {
                                 IsPlanLessonStatus = 1;
                             }
-                            else if (plan.Where(x => x.BeiKeStatus > 0 && x.ClassPlanId == itemTime.ClassPlanId).Count() == plan.Where(x => x.ClassPlanId == itemTime.ClassPlanId).Count())
+                            else if (plan.Where(x => x.BeiKeStatus > 0 && (x.ClassPlanId == itemTime.ClassPlanId || x.ClassDate == Convert.ToDateTime(Common.ConvertHelper.FormatDate(itemTime.NewPlanDateTime)))).Count() == plan.Where(x => (x.ClassPlanId == itemTime.ClassPlanId || x.ClassDate == Convert.ToDateTime(Common.ConvertHelper.FormatDate(itemTime.NewPlanDateTime)))).Count())
                             {
                                 IsPlanLessonStatus = 2;
                             }
@@ -1799,10 +1808,12 @@ namespace Edu.WebApi.Controllers.Course
                     planListResult.Add(new
                     {
                         LessonPlanNum = plan.Where(x => x.ClassId == itemGroup.Key.ClassId && x.TeacherId == itemGroup.Key.TeacherId).FirstOrDefault()?.BeiKeStatus ?? 0,
+                        ParentFanKuiStatus = plan.Where(x => x.ClassId == itemGroup.Key.ClassId && x.TeacherId == itemGroup.Key.TeacherId).FirstOrDefault()?.ParentFanKuiStatus ?? 0,
                         LessonPlanSummaryNum = plan.Where(x => x.ClassId == itemGroup.Key.ClassId && x.TeacherId == itemGroup.Key.TeacherId).FirstOrDefault()?.FanKuiStatus ?? 0,
                         Ranks = plan.Where(x => x.ClassId == itemGroup.Key.ClassId && x.TeacherId == itemGroup.Key.TeacherId).FirstOrDefault()?.Ranks ?? -1,
                         School_Id = plan.Where(x => x.ClassId == itemGroup.Key.ClassId && x.TeacherId == itemGroup.Key.TeacherId).FirstOrDefault()?.School_Id ?? -1,
                         ClassPlanId = plan.Where(x => x.ClassId == itemGroup.Key.ClassId && x.TeacherId == itemGroup.Key.TeacherId).FirstOrDefault()?.ClassPlanId ?? -1,
+                        ClassDateStr = startTime.AddDays(i).ToString("yyyy-MM-dd"),
                         itemGroup.Key.TeacherId,
                         itemGroup.Key.ClassId,
                         ClassName = plan.Where(x => x.ClassId == itemGroup.Key.ClassId).FirstOrDefault()?.ClassName ?? "",
@@ -1843,6 +1854,19 @@ namespace Edu.WebApi.Controllers.Course
                 Group_Id = base.UserInfo.Group_Id,
                 //School_Id = base.ParmJObj.GetInt("School_Id"),
             };
+            try
+            {
+                string classDate = base.ParmJObj.GetStringValue("ClassDate");
+                if (!string.IsNullOrWhiteSpace(classDate))
+                {
+                    query.ClassDate = Convert.ToDateTime(classDate);
+                }
+               
+            }
+            catch (Exception ex)
+            {
+                Common.Plugin.LogHelper.Write(ex, "GetLessonCommentList");
+            }
             query.Group_Id = base.UserInfo.Group_Id;
             var list = classModule.GetLessonCommentList(query);
             foreach (var item in list)
@@ -1858,7 +1882,7 @@ namespace Edu.WebApi.Controllers.Course
 
 
         /// <summary>
-        /// 新增/删除老师备案评论
+        /// 新增/修改老师备案评论
         /// </summary>
         /// <returns></returns>
         public ApiResult SetLessonComment()
@@ -1875,7 +1899,6 @@ namespace Edu.WebApi.Controllers.Course
             {
                 return ApiResult.Failed("评论内容不能为空");
             }
-
             bool flag = classModule.SetLessonComment(query);
             if (flag)
             {
@@ -1897,6 +1920,29 @@ namespace Edu.WebApi.Controllers.Course
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+        /// <summary>
+        /// 删除教案评论
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult DelLessonComment()
+        {
+            int Id = base.ParmJObj.GetInt("LessonCommentId");
+            var model = classModule.GetLessonCommentList(new RB_Class_LessonComment_ViewModel { LessonCommentId = Id }).FirstOrDefault();
+            if (model == null || model.LessonCommentId == 0)
+            {
+                return ApiResult.Failed("评论信息不存在");
+            }
+            if (model.Score > 0)
+            {
+                return ApiResult.Failed("打分的评论不能删除");
+            }
+            bool flag = classModule.DelLessonComment(model);
+            return flag ? ApiResult.Success("删除成功") : ApiResult.Failed("删除失败");
+        }
+
+
+
+
 
         /// <summary>
         /// 判断当前用户是否已评论当前教案
@@ -1909,6 +1955,18 @@ namespace Edu.WebApi.Controllers.Course
                 ClassPlanId = base.ParmJObj.GetInt("ClassPlanId"),
                 ClassId = base.ParmJObj.GetInt("ClassId"),
             };
+            try
+            {
+                string classDate = base.ParmJObj.GetStringValue("ClassDate");
+                if (!string.IsNullOrWhiteSpace(classDate))
+                {
+                    query.ClassDate = Convert.ToDateTime(classDate);
+                }
+            }
+            catch (Exception ex)
+            {
+                Common.Plugin.LogHelper.Write(ex, "GetLessonCommentList");
+            }
             query.Group_Id = base.UserInfo.Group_Id;
             query.CreateBy = base.UserInfo.Id;
             var list = classModule.GetLessonCommentList(query);
@@ -2221,7 +2279,7 @@ namespace Edu.WebApi.Controllers.Course
                 {
                     endDate = Common.ConvertHelper.FormatDate(DateTime.Now);
                 }
-            }                                                                    
+            }
             RB_Class_Plan_ViewModel query = new RB_Class_Plan_ViewModel()
             {
                 StartTime = startDate,

Edu.WebApi/Controllers/Course/ClassRoomController.cs

@@ -501,7 +501,7 @@ namespace Edu.WebApi.Controllers.Course
 
             var orderGuestList = classModule.GetOrderGuestListModule(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = 0, ClassId = classModel.ClassId });
             var checkLogList = classModule.GetClassCheckList(new RB_Class_Check_ViewModel { Group_Id = base.UserInfo.Group_Id, School_Id = -1, ClassId = classModel.ClassId, StartDate = timeModel.NewPlanDateTime, EndDate = timeModel.NewPlanDateTime });
-            foreach (var item in orderGuestList.Where(x => x.GuestState == 1 || x.GuestState == 6 || (x.GuestState == 5 && x.StopClassEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.StopClassEffectTime)) >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(timeModel.NewPlanDateTime)))))
+            foreach (var item in orderGuestList.Where(x => x.GuestState == 1 || x.GuestState == 6 || ((x.GuestState == 5||x.GuestState==7) && x.ChangeEffectTime.HasValue && Convert.ToDateTime(Common.ConvertHelper.FormatDate(x.ChangeEffectTime)) >= Convert.ToDateTime(Common.ConvertHelper.FormatDate(timeModel.NewPlanDateTime)))))
             {
                 item.IsCheck = (checkLogList != null && checkLogList.Any()) ? checkLogList.Where(y => y.OrderGuestId == item.Id).FirstOrDefault()?.CheckStatus ?? 2 : 2;
             }

Edu.WebApi/Controllers/Course/TeacherClassController.cs

@@ -263,6 +263,57 @@ namespace Edu.WebApi.Controllers.Course
             pageModel.PageData = result;
             return ApiResult.Success(data: pageModel);
         }
+
+
+
+
+        /// <summary>
+        /// 获取学员列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetNotClassStudentList()
+        {
+            var model = new RB_Order_Guest_ViewModel
+            {
+                Teacher_Id = base.ParmJObj.GetInt("Teacher_Id", 0),
+                GuestName = base.ParmJObj.GetStringValue("GuestName"),
+                ClassId = base.ParmJObj.GetInt("ClassId", 0),
+                CourseId = base.ParmJObj.GetInt("CourseId", 0),
+                EnterID = base.ParmJObj.GetInt("EnterID", 0),
+            };
+            model.Group_Id = base.UserInfo.Group_Id;
+            var list = classModule.GetNotClassStudentList(model);
+            List<object> result = new List<object>();
+            foreach (var item in list)
+            {
+                if (item.EnterID > 0)
+                {
+                    item.EnterName = UserReidsCache.GetUserLoginInfo(item.EnterID)?.AccountName ?? "";
+                }
+                result.Add(new
+                {
+                    item.Id,
+                    item.GuestName,
+                    item.Mobile,
+                    item.ClassId,
+                    item.ClassName,
+                    item.CourseId,
+                    item.CourseName,
+                    item.GuestState,
+                    item.GuestStateStr,
+                    item.School_Id,
+                    item.Teacher_Id,
+                    item.TotalPlanNum,
+                    item.Ranks,
+                    item.EnterName,
+                    item.EnterID,
+                    item.IsRenewOrder,
+                    item.RenewOrderId
+                });
+            }
+            return ApiResult.Success(data: result);
+        }
         #endregion
     }
 }

Edu.WebApi/Controllers/EduTask/TempInvitationClassController.cs

@@ -49,6 +49,20 @@ namespace Edu.WebApi.Controllers.EduTask
                 OrderGuestIds = base.ParmJObj.GetStringValue("OrderGuestIds"),
                 Remarks = base.ParmJObj.GetStringValue("Remarks")
             };
+            if (string.IsNullOrWhiteSpace(model.OrderGuestIds))
+            {
+                return ApiResult.Failed("请选择您要邀请的学生");
+            }
+
+            if (model.ClassId == 0)
+            {
+                return ApiResult.Failed("请选择您要邀请上课的班级");
+            }
+
+            if (model.ClassPlanId == 0 || model.ClassTimeId == 0)
+            {
+                return ApiResult.Failed("请选择您要邀请的时间");
+            }
             var classModel = classModule.GetClassModule(model.ClassId);
             model.CourseId = classModel.CouseId;
             model.TeacherId = classModel.Teacher_Id;

Edu.WebApi/Timers/TimerJobj.cs

@@ -61,7 +61,7 @@ namespace Edu.WebApi.Timers
 
             timer4 = new System.Timers.Timer()
             {
-                Interval = (1000 * 60) * (1 * 60 ) //1小时执行一次
+                Interval = (1000 * 60) * (1 * 10 ) //1小时执行一次
             };
             timer4.Elapsed += new System.Timers.ElapsedEventHandler(UpdateAuditThroughStudent);
             timer4.Enabled = true;