页面修改

Edu.EducationCore/EducationTimerServer.cs

@@ -33,7 +33,7 @@ namespace Edu.Education
             //new QuarzHelper().EduB2BOrderCancelTimer().GetAwaiter().GetResult();//教育同业订单超时取消  (2022-01-25 暂屏蔽)
             //new QuarzHelper().EduB2BOrderCommissionTimer().GetAwaiter().GetResult();//教育同业订单返佣   (2022-01-25 暂屏蔽)
             new QuarzHelper().EduCreateScrollClassTimer().GetAwaiter().GetResult();//滚动开班  
-            new QuarzHelper().EduCreateScrollAppointmentTimer().GetAwaiter().GetResult();//预约课程
+    
             new QuarzHelper().EduCreateScrollChapterTimer().GetAwaiter().GetResult();//预约章节自动生成  2022-02-14
             new QuarzHelper().CheckPerparingTimer().GetAwaiter().GetResult();
         }

Edu.EducationCore/Helper/QuarzHelper.cs

@@ -42,13 +42,6 @@ namespace Edu.Education.Helper
             IJobDetail job = JobBuilder.Create<CreateTeachingPerf>()
                 .WithIdentity("job1", "group1")
                 .Build();
-            //ITrigger trigger = TriggerBuilder.Create()
-            //    .WithIdentity("trigger1", "group1")
-            //    .StartNow()
-            //    .WithSimpleSchedule(x => x
-            //        .WithIntervalInHours(2)
-            //        .RepeatForever())
-            //    .Build();
             ICronTrigger trigger = (ICronTrigger)TriggerBuilder.Create()
                 .WithIdentity("trigger1", "group1")
                 .WithCronSchedule(cronExpression)
@@ -75,13 +68,6 @@ namespace Edu.Education.Helper
             IJobDetail job = JobBuilder.Create<CreateOKRPeriod>()
                 .WithIdentity("job2", "group2")
                 .Build();
-            //ITrigger trigger = TriggerBuilder.Create()
-            //    .WithIdentity("trigger2", "group2")
-            //    .StartNow()
-            //    .WithSimpleSchedule(x => x
-            //        .WithIntervalInHours(2)
-            //        .RepeatForever())
-            //    .Build();
             ICronTrigger trigger = (ICronTrigger)TriggerBuilder.Create()
                 .WithIdentity("trigger2", "group2")
                 .WithCronSchedule(cronExpression)
@@ -136,13 +122,6 @@ namespace Edu.Education.Helper
             IJobDetail job = JobBuilder.Create<CreateRevenueReport>()
                 .WithIdentity("job4", "group4")
                 .Build();
-            //ITrigger trigger = TriggerBuilder.Create()
-            //    .WithIdentity("trigger4", "group4")
-            //    .StartNow()
-            //    .WithSimpleSchedule(x => x
-            //        .WithIntervalInHours(1)
-            //        .RepeatForever())
-            //    .Build();
             ICronTrigger trigger = (ICronTrigger)TriggerBuilder.Create()
                 .WithIdentity("trigger4", "group4")
                 .WithCronSchedule(CronExpression2)
@@ -196,13 +175,7 @@ namespace Edu.Education.Helper
             IJobDetail job = JobBuilder.Create<CreateWeXinMedium>()
                 .WithIdentity("job6", "group6")
                 .Build();
-            //ITrigger trigger = TriggerBuilder.Create()
-            //    .WithIdentity("trigger6", "group6")
-            //    .StartNow()
-            //    .WithSimpleSchedule(x => x
-            //        .WithIntervalInHours(1)
-            //        .RepeatForever())
-            //    .Build();
+
             ICronTrigger trigger = (ICronTrigger)TriggerBuilder.Create()
                 .WithIdentity("trigger6", "group6")
                 .WithCronSchedule(CronExpression2)
@@ -262,13 +235,7 @@ namespace Edu.Education.Helper
             IJobDetail job = JobBuilder.Create<EduB2BOrderCancel>()
                 .WithIdentity("job8", "group8")
                 .Build();
-            //ITrigger trigger = TriggerBuilder.Create()
-            //    .WithIdentity("trigger7", "group7")
-            //    .StartNow()
-            //    .WithSimpleSchedule(x => x
-            //        .WithIntervalInHours(1)
-            //        .RepeatForever())
-            //    .Build();
+
             ICronTrigger trigger = (ICronTrigger)TriggerBuilder.Create()
                 .WithIdentity("trigger8", "group8")
                 .WithCronSchedule(CronExpression2)

Edu.Model/ViewModel/Grade/RB_Class_ViewModel.cs

@@ -13,6 +13,12 @@ namespace Edu.Model.ViewModel.Grade
     [Serializable]
     public class RB_Class_ViewModel : RB_Class
     {
+
+        /// <summary>
+        /// 查询指定日期上课计划
+        /// </summary>
+        public string QClassDate { get; set; }
+
         /// <summary>
         /// 创建人
         /// </summary>

Edu.Repository/Grade/RB_Class_PlanRepository.cs

@@ -27,9 +27,12 @@ namespace Edu.Repository.Grade
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
 SELECT A.*,IFNULL(B.RoomName,'') AS RoomName,IFNULL(T.TeacherName,'') AS TeacherName,IFNULL(T.TeacherHead,'') AS UserIcon,IFNULL(C.ClassName,'') AS ClassName
+       ,Time.StartTime,time.EndTime,time.ClassTimeId,time.TimeHour
+       ,TIMESTAMPDIFF(MINUTE, CONCAT('2020-12-16',' ',time.StartTime), CONCAT('2020-12-16',' ',time.EndTime)) AS ClassMinutes
 FROM RB_Class_Plan AS A LEFT JOIN rb_class_room AS B ON A.ClassRoomId=B.RoomId
      LEFT JOIN rb_teacher AS T ON A.TeacherId=T.TId
      LEFT JOIN rb_class AS C ON A.ClassId=C.ClassId
+     LEFT JOIN rb_class_time AS time ON A.ClassPlanId=Time.ClassPlanId
 WHERE 1=1 
 ");
             builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Status), (int)DateStateEnum.Normal);
@@ -79,6 +82,10 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.PlanType), query.PlanType);
                 }
+                if (!string.IsNullOrEmpty(query.QClassDateStr))
+                {
+                    builder.AppendFormat(" AND DATE_FORMAT(A.{0},'%y/%m/%d')= DATE_FORMAT('{1}','%y/%m/%d') ", nameof(RB_Class_Plan_ViewModel.ClassDate), query.QClassDateStr);
+                }
             }
             return Get<RB_Class_Plan_ViewModel>(builder.ToString()).ToList();
         }