Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Module.Course/ClassModule.cs

@@ -1087,6 +1087,8 @@ namespace Edu.Module.Course
         }
 
 
+
+
         /// <summary>
         /// 获取班级学员树形结构
         /// </summary>
@@ -5841,5 +5843,53 @@ namespace Edu.Module.Course
                 }
             }
         }
+
+
+        /// <summary>
+        /// 初始化上课计划时间
+        /// </summary>
+        /// <param name="classIds"></param>
+        public void InitClassPlanModule(string classIds)
+        {
+            var classList = classRepository.GetClassListRepository(new RB_Class_ViewModel() { Q_ClassIds = classIds });
+            var planList=  class_PlanRepository.GetClassPlanListExtRepository(new RB_Class_Plan_ViewModel() { QClassIds = classIds });
+            if (classList != null && classList.Count > 0)
+            {
+                foreach (var item in classList)
+                {
+                    var tempPlanList = planList.Where(qitem => qitem.ClassId == item.ClassId)?.ToList();
+                    if (tempPlanList != null && tempPlanList.Count > 0)
+                    {
+                        var firstModel = tempPlanList.FirstOrDefault();
+                        foreach (var subItem in tempPlanList)
+                        {
+                            if (subItem.ClassTimeId != null && subItem.ClassTimeId > 0)
+                            {
+
+                            }
+                            else
+                            {
+                                var timeModel = new RB_Class_Time()
+                                {
+                                     ClassTimeId=0,
+                                     ClassId=item.ClassId,
+                                     ClassPlanId=subItem.ClassPlanId,
+                                     StartTime= firstModel.StartTime,
+                                     EndTime=firstModel.EndTime,
+                                     Group_Id=item.Group_Id,
+                                     School_Id=item.School_Id,
+                                     ClassStatus=0,
+                                     TimeHour=2,
+                                };
+                                class_TimeRepository.Insert(timeModel);
+                            }
+                        }
+                    }
+                }
+            }
+           
+
+            //11
+        }
     }
 }
\ No newline at end of file

Edu.WebApi/Controllers/User/LoginController.cs

@@ -58,12 +58,18 @@ namespace Edu.WebApi.Controllers.User
 
         private readonly CourseModule courseModule = new CourseModule();
 
+        /// <summary>
+        /// 班级处理类对象
+        /// </summary>
+        private readonly ClassModule classModule = new ClassModule();
+
         [HttpGet]
         [HttpPost]
         [AllowAnonymous]
         public ApiResult Test()
         {
-            courseModule.RunWordsUrlModule();
+            //courseModule.RunWordsUrlModule();
+           
             return ApiResult.Success();
         }
 

Edu.WebApi/Timers/TimerJobj.cs

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