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

Edu.WebApi/Controllers/Course/ClassRoomController.cs

@@ -230,6 +230,49 @@ namespace Edu.WebApi.Controllers.Course
 
 
 
+
+        /// <summary>
+        /// 老师上课计划统计
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetNewClassRoomTimeList()
+        {
+            var startDate = base.ParmJObj.GetStringValue("StartTime");
+            var endDate = base.ParmJObj.GetStringValue("EndTime");
+            DateTime now = DateTime.Now;
+
+            //获取当前月的第一天
+            DateTime d1 = new DateTime(now.Year, now.Month, 1);
+            //当月最后一天
+            DateTime d2 = d1.AddMonths(1).AddDays(-1);
+            if (string.IsNullOrEmpty(startDate))
+            {
+                startDate = Common.ConvertHelper.FormatDate(d1);
+            }
+            if (string.IsNullOrEmpty(endDate))
+            {
+                endDate = Common.ConvertHelper.FormatDate(d2);
+            }
+            else
+            {
+                
+            }
+            RB_Class_Plan_ViewModel query = new RB_Class_Plan_ViewModel()
+            {
+                StartTime = startDate,
+                EndTime = endDate,
+                TeacherId = base.ParmJObj.GetInt("TeacherId"),
+                ClassRoomId = base.ParmJObj.GetInt("ClassRoomId"),
+                Group_Id = base.UserInfo.Group_Id,
+                ClassId = base.ParmJObj.GetInt("ClassId"),
+            };
+            //课程类型(0-全部,1-正常,2-试听课)
+            int ClassType = base.ParmJObj.GetInt("ClassType");
+            var obj = classModule.GetClassUseStatisticalModule(query, ClassType: ClassType);
+            return ApiResult.Success(data: obj);
+        }
+
+
         /// <summary>
         /// 教室使用记录
         /// </summary>