页面修改

Edu.Cache/obj/Debug/netcoreapp3.0/Edu.Cache.AssemblyInfo.cs

 //------------------------------------------------------------------------------
 // <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
+//     This code was generated by a tool.
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 

Edu.Common/Plugin/ConvertHelper.cs

@@ -381,5 +381,77 @@ namespace Edu.Common
             }
             return age < 0 ? 0 : age;
         }
+
+        /// <summary>
+        /// 获取最近一个星期一
+        /// </summary>
+        /// <param name="objDate"></param>
+        /// <returns></returns>
+        public static string GetWeekMonday(string objDate)
+        {
+            DateTime date = Convert.ToDateTime(objDate);
+            DateTime first = System.DateTime.Now;
+            switch (date.DayOfWeek)
+            {
+                case System.DayOfWeek.Monday:
+                    first = date;
+                    break;
+                case System.DayOfWeek.Tuesday:
+                    first = date.AddDays(-1);
+                    break;
+                case System.DayOfWeek.Wednesday:
+                    first = date.AddDays(-2);
+                    break;
+                case System.DayOfWeek.Thursday:
+                    first = date.AddDays(-3);
+                    break;
+                case System.DayOfWeek.Friday:
+                    first = date.AddDays(-4);
+                    break;
+                case System.DayOfWeek.Saturday:
+                    first = date.AddDays(-5);
+                    break;
+                case System.DayOfWeek.Sunday:
+                    first = date.AddDays(-6);
+                    break;
+            }
+            return FormatDate(first);
+        }
+
+        /// <summary>
+        /// 获取最近一个星期天
+        /// </summary>
+        /// <param name="objDate"></param>
+        /// <returns></returns>
+        public static string GetWeekSunday(string objDate)
+        {
+            DateTime date = Convert.ToDateTime(objDate);
+            DateTime last = Convert.ToDateTime(objDate);
+            switch (date.DayOfWeek)
+            {
+                case System.DayOfWeek.Monday:
+                    last = date.AddDays(6);
+                    break;
+                case System.DayOfWeek.Tuesday:
+                    last = date.AddDays(5);
+                    break;
+                case System.DayOfWeek.Wednesday:
+                    last = date.AddDays(4);
+                    break;
+                case System.DayOfWeek.Thursday:
+                    last = date.AddDays(3);
+                    break;
+                case System.DayOfWeek.Friday:
+                    last = date.AddDays(2);
+                    break;
+                case System.DayOfWeek.Saturday:
+                    last = date.AddDays(1);
+                    break;
+                case System.DayOfWeek.Sunday:
+                    last = date;
+                    break;
+            }
+            return FormatDate(last);
+        }
     }
 }
\ No newline at end of file

Edu.Module.Course/ClassModule.cs

@@ -2014,9 +2014,15 @@ namespace Edu.Module.Course
         /// <returns></returns>
         public object GetClassPlanStatisticalModule(RB_Class_Plan_ViewModel query)
         {
-            List<object> result = new List<object>();
-            var startTime = Convert.ToDateTime(query.StartTime);
-            var endTime = Convert.ToDateTime(query.EndTime);
+            List<object> mondayList = new List<object>();
+            List<object> tuesdayList = new List<object>();
+            List<object> wednesdayList = new List<object>();
+            List<object> thursdayList = new List<object>();
+            List<object> fridayList = new List<object>();
+            List<object> saturdayList = new List<object>();
+            List<object> sundayList = new List<object>();
+            var startTime = Convert.ToDateTime(Common.ConvertHelper.GetWeekMonday(query.StartTime));
+            var endTime = Convert.ToDateTime(Common.ConvertHelper.GetWeekSunday(query.EndTime));
             TimeSpan sp = endTime.Subtract(startTime);
             var days = sp.Days+1;
             var list = class_PlanRepository.GetClassPlanStatisticalRepository(query);
@@ -2052,10 +2058,33 @@ namespace Edu.Module.Course
                         WeekStr = Common.ConvertHelper.GetWeekDay(ClassDate),
                         SubList = subList
                     };
-                    result.Add(obj);
+                    switch (ClassDate.DayOfWeek)
+                    {
+                        case DayOfWeek.Monday:
+                            mondayList.Add(obj);
+                            break;
+                        case DayOfWeek.Tuesday:
+                            tuesdayList.Add(obj);
+                            break;
+                        case DayOfWeek.Wednesday:
+                            wednesdayList.Add(obj);
+                            break;
+                        case DayOfWeek.Thursday:
+                            thursdayList.Add(obj);
+                            break;
+                        case DayOfWeek.Friday:
+                            fridayList.Add(obj);
+                            break;
+                        case DayOfWeek.Saturday:
+                            saturdayList.Add(obj);
+                            break;
+                        case DayOfWeek.Sunday:
+                            sundayList.Add(obj);
+                            break;
+                    }
                 }
             }
-            return result;
+            return new { mondayList , tuesdayList , wednesdayList ,thursdayList, fridayList, saturdayList, sundayList };
         }
 
         /// <summary>

Edu.Repository/Course/RB_Class_PlanRepository.cs

@@ -470,7 +470,7 @@ where sog.Account_Id={query.StuId} and c.ClassStatus in(1,2) and c.`Status`=0 an
         public List<RB_Class_Plan_ViewModel> GetClassPlanStatisticalRepository(RB_Class_Plan_ViewModel query)
         {
             StringBuilder where = new StringBuilder();
-
+            where.AppendFormat(" AND B.ClassStatus NOT IN(1,4) ");
             if (query != null)
             {
                 if (query.Group_Id > 0)
@@ -502,12 +502,12 @@ FROM
 (
 SELECT A.ClassPlanId, A.ClassId,A.ClassDate,A.ClassRoomId,B.ClassName,C.CourseName,B.Teacher_Id,IFNULL(D.TeacherName,'') AS TeacherName,E.RoomName
      ,TIMESTAMPDIFF(MINUTE, CONCAT('2020-12-16',' ',F.StartTime), CONCAT('2020-12-16',' ',F.EndTime)) AS minNum,F.StartTime,F.EndTime 
-FROM  rb_class_plan AS A LEFT JOIN rb_class AS B ON A.ClassId=B.ClassId
+FROM  rb_class_plan AS A INNER JOIN rb_class AS B ON A.ClassId=B.ClassId
       LEFT JOIN rb_course AS C ON B.CouseId=C.CourseId
 	  LEFT JOIN rb_teacher AS D ON B.Teacher_Id=D.TId
 	  LEFT JOIN rb_class_room AS E ON A.ClassRoomId=E.RoomId
     LEFT JOIN rb_class_time F on A.ClassPlanId = F.ClassPlanId
-WHERE 1=1 AND A.`Status`=0 {0}
+WHERE 1=1 AND A.`Status`=0  {0}
 ) AS A
 GROUP BY A.ClassPlanId,A.ClassId ,A.ClassDate,A.ClassRoomId 
 ", where.ToString());

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -1852,20 +1852,26 @@ namespace Edu.WebApi.Controllers.Course
         {
             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(DateTime.Now.AddDays(1 - DateTime.Now.Day).Date);
+                startDate = Common.ConvertHelper.FormatDate(d1);
             }
             if (string.IsNullOrEmpty(endDate))
             {
-                endDate = Common.ConvertHelper.FormatDate(DateTime.Now);
+                endDate = Common.ConvertHelper.FormatDate(d2);
             }
             else
             {
-                if (Convert.ToDateTime(endDate) > Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now)))
-                {
-                    endDate = Common.ConvertHelper.FormatDate(DateTime.Now);
-                }
+                //if (Convert.ToDateTime(endDate) > Convert.ToDateTime(Common.ConvertHelper.FormatDate(DateTime.Now)))
+                //{
+                //    endDate = Common.ConvertHelper.FormatDate(DateTime.Now);
+                //}
             }
             RB_Class_Plan_ViewModel query = new RB_Class_Plan_ViewModel()
             {