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

Edu.Module.User/TeacherStaticModule.cs

@@ -488,12 +488,10 @@ namespace Edu.Module.User
                 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)
             {
-      
                 foreach (var item in list)
                 {
                     int teacherCount = 1;
@@ -502,7 +500,8 @@ namespace Edu.Module.User
                     if (teacherModel != null)
                     {
                         DateStr= teacherModel.AccountName;
-                        teacherCount = teacherList.Where(qitem => qitem.Dept_Id == teacherModel.Dept_Id).Count();
+                        string teacherIds = string.Join(",", teacherList.Where(qitem => qitem.Dept_Id == teacherModel.Dept_Id).Select(qitem => qitem.AccountId));
+                        teacherCount = list.Where(qitem => qitem.TotalScore>0 && teacherIds.Contains(item.TeacherId.ToString())).Count();
                     }
                     item.TotalScore = (item.StudentCount + item.AttendClassHourScore + item.OnLineInteractiveScore + item.RenewScore
                                         + item.UpgradeScore + item.TransScore + item.TrialSpeakScore - item.TruancyScore - item.WithdrawsScore - item.ComplaintScore

Edu.WebApi/Controllers/User/TeacherStaticController.cs

@@ -188,7 +188,7 @@ namespace Edu.WebApi.Controllers.User
                 {
                     ExcelRows = new List<ExcelColumn>()
                     {
-                       new ExcelColumn("日期"){ CellWidth=15},
+                       new ExcelColumn("老师"){ CellWidth=15},
                         new ExcelColumn("学生人数"){ CellWidth=15},
                         new ExcelColumn("上课时数"){ CellWidth=15},
                         new ExcelColumn("线上与学生互动数"){ CellWidth=10},