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

Edu.Repository/User/RB_Teacher_StaticRepository.cs

@@ -88,7 +88,7 @@ SELECT A.TeacherId,CONCAT(DATE_FORMAT(A.Date, '%Y-%m'),'-01') AS Date,A.YearStr,
 	   ,SUM(N1ClassHours) AS N1ClassHours,SUM(N1ClassHoursScore) AS N1ClassHoursScore,SUM(MiniAppPractise) AS MiniAppPractise,SUM(MiniAppPractiseScore) AS MiniAppPractiseScore,SUM(MiniAppTime) AS MiniAppTime
 	   ,SUM(MiniAppTimeScore) AS MiniAppTimeScore,SUM(TotalScore) AS TotalScore,SUM(AvgScore) AS AvgScore,SUM(ScoreGap) AS ScoreGap,SUM(ActivityNum) AS ActivityNum
 FROM RB_Teacher_Static AS A
-WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
+WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00' AND A.TeacherId>0
 ");
             if (query != null)
             {
@@ -98,14 +98,11 @@ WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
                 }
                 if (query.YearStr > 0)
                 {
-                    if (isYear)
-                    {
-                        builder.AppendFormat(" AND A.{0}<={1} ", nameof(RB_Teacher_Static_Extend.YearStr), query.YearStr);
-                    }
-                    else
-                    {
-                        builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Teacher_Static_Extend.YearStr), query.YearStr);
-                    }
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Teacher_Static_Extend.YearStr), query.YearStr);
+                }
+                if (query.MonthStr > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Teacher_Static_Extend.MonthStr), query.MonthStr);
                 }
             }
             builder.AppendFormat(" GROUP BY DATE_FORMAT(A.Date, '%Y-%m'),A.TeacherId ");

Edu.WebApi/Controllers/User/TeacherStaticController.cs

@@ -47,6 +47,104 @@ namespace Edu.WebApi.Controllers.User
             return ApiResult.Success(data: list);
         }
 
+
+        /// <summary>
+        /// 下载教师行为数据每日统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [Obsolete]
+        public FileContentResult DownLoadTeacherDay()
+        {
+            var query = new RB_Teacher_Static_Extend()
+            {
+                YearStr = base.ParmJObj.GetInt("YearStr"),
+                MonthStr = base.ParmJObj.GetInt("MonthStr"),
+                TeacherId = base.ParmJObj.GetInt("TeacherId"),
+                DeptId = base.ParmJObj.GetInt("DeptId"),
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var list = teacherStaticModule.GetTeacherStaticListModule(query);
+            string excelName = "教师行为数据每日统计.xls";
+            List<ExcelDataSource> slist = new List<ExcelDataSource>();
+            try
+            {
+                ExcelDataSource header = new ExcelDataSource
+                {
+                    ExcelRows = new List<ExcelColumn>()
+                    {
+                       new ExcelColumn("日期"){ CellWidth=15},
+                        new ExcelColumn("学生人数"){ CellWidth=15},
+                        new ExcelColumn("上课时数"){ CellWidth=15},
+                        new ExcelColumn("线上与学生互动数"){ CellWidth=10},
+                        new ExcelColumn("续约(含留学)"){ CellWidth=15},
+                        new ExcelColumn("学生升级"){ CellWidth=15},
+                        new ExcelColumn("转介绍"){ CellWidth=15},
+                        new ExcelColumn("试讲(次)"){ CellWidth=15},
+                        new ExcelColumn("学生旷课(次)"){ CellWidth=15},
+                        new ExcelColumn("学生退课(次)"){ CellWidth=15},
+                        new ExcelColumn("学生投诉(次)"){ CellWidth=15},
+                        new ExcelColumn("老师迟到早退(次)"){ CellWidth=15},
+                        new ExcelColumn("N5课程时数"){ CellWidth=15},
+                        new ExcelColumn("N4课程时数"){ CellWidth=15},
+                        new ExcelColumn("N3课程时数"){ CellWidth=15},
+                        new ExcelColumn("N2课程时数"){ CellWidth=15},
+                        new ExcelColumn("N1课程时数"){ CellWidth=15},
+                        new ExcelColumn("学生小程序刷题次数"){ CellWidth=15},
+                        new ExcelColumn("学生小程序刷题时间"){ CellWidth=15},
+                        new ExcelColumn("活动次数"){ CellWidth=15},
+                        new ExcelColumn("总分数"){ CellWidth=15},
+                        new ExcelColumn("所有老师平均分数"){ CellWidth=15},
+                        new ExcelColumn("分数差距"){ CellWidth=15},
+                    }
+                };
+                slist.Add(header);
+                foreach (var item in list)
+                {
+                    JObject dObj = JObject.Parse(JsonHelper.Serialize(item));
+                    var columns = new List<ExcelColumn>
+                    {
+                        new ExcelColumn(dObj.GetStringValue("DateStr"))
+                    };
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("StudentCount")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("AttendClassHourScore")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("OnLineInteractiveScore")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("RenewScore")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("UpgradeScore")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("TransScore")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("TrialSpeakScore")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("TruancyScore")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("WithdrawsScore")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ComplaintScore")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("TeacherBeLateScore")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("N5ClassHoursScore")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("N4ClassHoursScore")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("N3ClassHoursScore")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("N2ClassHoursScore")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("N1ClassHoursScore")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("MiniAppPractiseScore")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("MiniAppTimeScore")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ActivityNum")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("TotalScore")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("AvgScore")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ScoreGap")));
+                    var dataRow = new ExcelDataSource()
+                    {
+                        ExcelRows = columns
+                    };
+                    slist.Add(dataRow);
+                }
+                var byteData = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData, "application/octet-stream", excelName);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "DownLoadTeacherDay");
+                var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
+                return File(byteData1, "application/octet-stream", excelName);
+            }
+        }
+
         /// <summary>
         /// 教师行为数据月度统计
         /// </summary>
@@ -64,23 +162,22 @@ namespace Edu.WebApi.Controllers.User
             return ApiResult.Success(data: list);
         }
 
+
         /// <summary>
         /// 下载教师行为数据每日统计
         /// </summary>
         /// <returns></returns>
         [HttpPost]
         [Obsolete]
-        public FileContentResult DownLoadTeacherDay()
+        public FileContentResult DownLoadTeacherMonthStatic()
         {
             var query = new RB_Teacher_Static_Extend()
             {
                 YearStr = base.ParmJObj.GetInt("YearStr"),
                 MonthStr = base.ParmJObj.GetInt("MonthStr"),
-                TeacherId = base.ParmJObj.GetInt("TeacherId"),
-                DeptId = base.ParmJObj.GetInt("DeptId"),
             };
             query.Group_Id = base.UserInfo.Group_Id;
-            var list = teacherStaticModule.GetTeacherStaticListModule(query);
+            var list = teacherStaticModule.GetTeacherStaticMonthExtListModule(query);
             string excelName = "教师行为数据每日统计.xls";
             List<ExcelDataSource> slist = new List<ExcelDataSource>();
             try
@@ -155,12 +252,13 @@ namespace Edu.WebApi.Controllers.User
             }
             catch (Exception ex)
             {
-                LogHelper.Write(ex, "DownLoadTeacherDay");
+                LogHelper.Write(ex, "DownLoadTeacherMonthStatic");
                 var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
                 return File(byteData1, "application/octet-stream", excelName);
             }
         }
 
+
         /// <summary>
         /// 教师行为数据每月统计
         /// </summary>