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

Edu.Module.User/TeacherStaticModule.cs

@@ -474,10 +474,21 @@ namespace Edu.Module.User
         /// <returns></returns>
         public List<object> GetTeacherStaticMonthExtListModule(RB_Teacher_Static_Extend query)
         {
+            var teacherList = new List<RB_Account_ViewModel>();
             var queryTeacher = new RB_Account_ViewModel() { AccountType = Common.Enum.User.AccountTypeEnum.Teacher, IsSelectLevelNor = 1 };
-            var teacherList = accountRepository.GetAccountListExtRepository(queryTeacher)
-                 .Where(qitem => qitem.AccountId != 5 && qitem.AccountId != 10 && qitem.AccountId != 15 && qitem.AccountId != 20).ToList();
-        
+            if (query.DeptId > 0)
+            {
+                queryTeacher.Dept_Id = query.DeptId;
+                teacherList = accountRepository.GetAccountListExtRepository(queryTeacher);
+                query.QTeacherIds = string.Join(",", teacherList.Select(qitem => qitem.AccountId));
+            }
+            else
+            {
+                teacherList = accountRepository.GetAccountListExtRepository(queryTeacher);
+                query.QTeacherIds = "";
+            }
+            teacherList = teacherList.Where(qitem => qitem.AccountId != 5 && qitem.AccountId != 10 && qitem.AccountId != 15 && qitem.AccountId != 20).ToList();
+           
             List<object> dataList = new List<object>();
             var list = teacher_StaticRepository.GetTeacherStaticMonthExtListRepository(query);
             if (list != null && list.Count > 0)
@@ -503,6 +514,8 @@ namespace Edu.Module.User
                     dataList.Add(new
                     {
                         item.Id,
+                        item.TeacherId,
+                        Dept_Id= teacherModel?.Dept_Id??0,
                         DateStr,
                         item.StudentCount,
                         item.AttendClassHour,
@@ -549,6 +562,8 @@ namespace Edu.Module.User
                 dataList.Add(new
                 {
                     Id = 0,
+                    TeacherId=0,
+                    Dept_Id=0,
                     DateStr = "月总数",
                     StudentCount = tempList?.Sum(qitem => qitem.StudentCount),
                     AttendClassHour = tempList?.Sum(qitem => qitem.AttendClassHour),

Edu.Repository/User/RB_Teacher_StaticRepository.cs

@@ -104,6 +104,10 @@ WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00' AND A.TeacherId>0
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Teacher_Static_Extend.MonthStr), query.MonthStr);
                 }
+                if (!string.IsNullOrEmpty(query.QTeacherIds))
+                {
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Teacher_Static_Extend.TeacherId), query.QTeacherIds);
+                }
             }
             builder.AppendFormat(" GROUP BY DATE_FORMAT(A.Date, '%Y-%m'),A.TeacherId ");
             builder.AppendFormat(" ORDER BY DATE_FORMAT(A.Date, '%Y-%m') ASC ");

Edu.WebApi/Controllers/User/TeacherStaticController.cs

@@ -156,6 +156,7 @@ namespace Edu.WebApi.Controllers.User
             {
                 YearStr = base.ParmJObj.GetInt("YearStr"),
                 MonthStr = base.ParmJObj.GetInt("MonthStr"),
+                DeptId=base.ParmJObj.GetInt("DeptId"),
             };
             query.Group_Id = base.UserInfo.Group_Id;
             var list = teacherStaticModule.GetTeacherStaticMonthExtListModule(query);
@@ -175,6 +176,7 @@ namespace Edu.WebApi.Controllers.User
             {
                 YearStr = base.ParmJObj.GetInt("YearStr"),
                 MonthStr = base.ParmJObj.GetInt("MonthStr"),
+                DeptId = base.ParmJObj.GetInt("DeptId"),
             };
             query.Group_Id = base.UserInfo.Group_Id;
             var list = teacherStaticModule.GetTeacherStaticMonthExtListModule(query);