新增人数统计

Edu.Model/ViewModel/User/RB_Student_Company_Extend.cs

@@ -31,5 +31,36 @@ namespace Edu.Model.ViewModel.User
         /// 查询待收金额不为0的数据
         /// </summary>
         public int IsQueryNotMoney { get; set; }
+
+        /// <summary>
+        /// 当月上课人数【當月份尚未結束銷課的總人數(包含當月新報名)】
+        /// </summary>
+        public decimal ClassStudentCount { get; set; }
+    }
+
+    /// <summary>
+    /// 每月学生总数和毕业数统计
+    /// </summary>
+    public class MonthStudentItem
+    {
+        /// <summary>
+        /// 年份
+        /// </summary>
+        public int YearStr { get; set; }
+
+        /// <summary>
+        /// 月份
+        /// </summary>
+        public int MonthStr { get; set; }
+
+        /// <summary>
+        /// 每月学生总数
+        /// </summary>
+        public decimal TotalGuest { get; set; }
+
+        /// <summary>
+        /// 每月毕业学生总数
+        /// </summary>
+        public decimal FinishGuest { get; set; }
     }
 }

Edu.Module.User/StudentStatModule.cs

@@ -6207,10 +6207,16 @@ namespace Edu.Module.User
         {
             List<object> dataList = new List<object>();
             var list = student_CompanyRepository.GetStudentCompanyMonthListRepository(query);
+            var studentList = student_CompanyRepository.GetMonthStudentListRepository();
             List<RB_Student_Company_Extend> monthList = new List<RB_Student_Company_Extend>();
             for (var i = 1; i <= 12; i++)
             {
+                var tempStudent = new MonthStudentItem();
                 var tempData = list?.Where(qitem => qitem.Date.Month == i)?.FirstOrDefault();
+                if (tempData != null)
+                {
+                    tempStudent = studentList.Where(qitem => qitem.YearStr == query.YearStr && qitem.MonthStr <= i).LastOrDefault();
+                }
                 var newData = new RB_Student_Company_Extend()
                 {
                     ShowMonthStr = i + "月",
@@ -6247,6 +6253,7 @@ namespace Edu.Module.User
                     StudyOrderMoney = tempData?.StudyOrderMoney ?? 0,
                     OrderNotMoney = tempData?.OrderNotMoney ?? 0,
                     StudyOrderNotMoney = tempData?.StudyOrderNotMoney ?? 0,
+                    ClassStudentCount = (tempStudent?.TotalGuest ?? 0) - (tempStudent?.FinishGuest ?? 0)
                 };
                 monthList.Add(newData);
             }
@@ -6286,6 +6293,7 @@ namespace Edu.Module.User
                 StudyOrderMoney = Math.Round(monthList?.Average(qitem => qitem.StudyOrderMoney) ?? 0, 2),
                 OrderNotMoney = Math.Round(monthList?.Average(qitem => qitem.OrderNotMoney) ?? 0, 2),
                 StudyOrderNotMoney = Math.Round(monthList?.Average(qitem => qitem.StudyOrderNotMoney) ?? 0, 2),
+                ClassStudentCount= Math.Round(monthList?.Average(qitem => qitem.ClassStudentCount) ?? 0, 2),
             };
 
             var sumModel = new RB_Student_Company_Extend()
@@ -6324,6 +6332,7 @@ namespace Edu.Module.User
                 StudyOrderMoney = monthList?.Sum(qitem => qitem.StudyOrderMoney) ?? 0,
                 OrderNotMoney = monthList?.Sum(qitem => qitem.OrderNotMoney) ?? 0,
                 StudyOrderNotMoney = monthList?.Sum(qitem => qitem.StudyOrderNotMoney) ?? 0,
+                ClassStudentCount= monthList?.Sum(qitem => qitem.ClassStudentCount) ?? 0,
             };
             monthList.Add(avgModel);
             monthList.Add(sumModel);
@@ -6366,6 +6375,7 @@ namespace Edu.Module.User
                     item.StudyOrderMoney,
                     item.OrderNotMoney,
                     item.StudyOrderNotMoney,
+                    item.ClassStudentCount,
                 });
             }
             return dataList;

Edu.Module.User/TeacherAssessmentModule.cs

@@ -236,6 +236,28 @@ namespace Edu.Module.User
             return list;
         }
 
+        /// <summary>
+        /// 获取老师考核数据
+        /// </summary>
+        /// <param name="TeacherAccountId"></param>
+        /// <returns></returns>
+        public object GetTeacherAssessmentModule(int TeacherAccountId,int YearStr=2022,int MonthStr=4)
+        {
+            object obj = new object();
+            var extModel = teacher_AssessmentRepository.GetTeacherAssessmentListRepository(new RB_Teacher_Assessment_Extend()
+            {
+                YearStr = YearStr,
+                MonthStr = MonthStr,
+                TeacherAccountId = TeacherAccountId
+            }).FirstOrDefault();
+
+            var typeList = GetAssessmentTypeListModule(new RB_Assessment_Type_Extend() { });
+            obj = new
+            {
+                Id=extModel?.Id??0,
+            };
+            return obj;
+        }
         #endregion
     }
 }
\ No newline at end of file

Edu.Repository/DataStatistics/RB_Teacher_AssessmentRepository.cs

@@ -49,5 +49,41 @@ WHERE 1=1
             }
             return GetPage<RB_Teacher_Assessment_Extend>(pageIndex,pageSize,out rowsCount,builder.ToString()).ToList();
         }
+
+
+        /// <summary>
+        /// 获取教师月度考核列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Teacher_Assessment_Extend> GetTeacherAssessmentListRepository(  RB_Teacher_Assessment_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.* 
+FROM RB_Teacher_Assessment AS A
+WHERE 1=1
+");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Teacher_Assessment_Extend.Group_Id), query.Group_Id);
+                }
+                if (query.YearStr > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Teacher_Assessment_Extend.YearStr), query.YearStr);
+                }
+                if (query.MonthStr > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Teacher_Assessment_Extend.MonthStr), query.MonthStr);
+                }
+                if (query.TeacherAccountId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Teacher_Assessment_Extend.TeacherAccountId), query.TeacherAccountId);
+                }
+            }
+            return Get<RB_Teacher_Assessment_Extend>(builder.ToString()).ToList();
+        }
     }
 }

Edu.Repository/User/RB_Student_CompanyRepository.cs

@@ -153,5 +153,15 @@ WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
             string sql = "TRUNCATE TABLE RB_Student_Company";
             base.Execute(sql);
         }
+
+        /// <summary>
+        /// 获取每月学生总数
+        /// </summary>
+        /// <returns></returns>
+        public List<MonthStudentItem> GetMonthStudentListRepository()
+        {
+            string sql = "call proc_guest_static()";
+            return Get<MonthStudentItem>(sql).ToList();
+        }
     }
 }

Edu.WebApi/Controllers/DataService/TeacherAssessmentController.cs

@@ -196,9 +196,11 @@ namespace Edu.WebApi.Controllers.DataService
         public ApiResult GetTeacherAssessmentInfo()
         {
             int TeacherAccountId = base.ParmJObj.GetInt("TeacherAccountId");
-
-            return ApiResult.Failed();
+            var obj = teacherAssessmentModule.GetTeacherAssessmentModule(TeacherAccountId);
+            return ApiResult.Success(data: obj);
         }
+
+
         #endregion
     }
 }

Edu.WebApi/Controllers/User/StudentStatController.cs

@@ -1687,6 +1687,7 @@ namespace Edu.WebApi.Controllers.User
                         new ExcelColumn("语培签约待收金额"){ CellWidth=15},
                         new ExcelColumn("留学签约金额"){ CellWidth=15},
                         new ExcelColumn("留学签约待收金额"){ CellWidth=15},
+                        new ExcelColumn("语培上课人数"){ CellWidth=15},
                     }
                 };
                 slist.Add(header);
@@ -1730,6 +1731,7 @@ namespace Edu.WebApi.Controllers.User
                     columns.Add(new ExcelColumn(dObj.GetStringValue("OrderNotMoney")));
                     columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderMoney")));
                     columns.Add(new ExcelColumn(dObj.GetStringValue("StudyOrderNotMoney")));
+                    columns.Add(new ExcelColumn(dObj.GetStringValue("ClassStudentCount")));
                     var dataRow = new ExcelDataSource()
                     {
                         ExcelRows = columns