页面修改

Edu.Model/Entity/User/RB_Teacher_Static.cs

@@ -21,7 +21,7 @@ namespace Edu.Model.Entity.User
         public DateTime Date { get; set; }
 
         /// <summary>
-        /// 学生人数
+        /// 学生人次
         /// </summary>
         public decimal StudentCount { get; set; }
 
@@ -254,5 +254,26 @@ namespace Edu.Model.Entity.User
         /// 教师编号
         /// </summary>
         public int TeacherId { get; set; }
+
+        /// <summary>
+        /// 试讲成功得分(班课)1分
+        /// </summary>
+        public decimal SpeakClassScore { get; set; }
+
+        /// <summary>
+        /// 试讲成功得分(Vip课程)2分
+        /// </summary>
+        public decimal SpeakVipScore { get; set; }
+
+        /// <summary>
+        /// 试讲失败
+        /// </summary>
+        public decimal SpeakFailScore { get; set; }
+
+        /// <summary>
+        /// 考级升级得分
+        /// </summary>
+        public decimal GradeTestScore { get; set; }
+ 
     }
 }
\ No newline at end of file

Edu.Module.User/TeacherAssessmentModule.cs

@@ -368,7 +368,7 @@ namespace Edu.Module.User
                 Id = extModel?.Id ?? 0,
                 YearStr = extModel?.YearStr ?? 0,
                 MonthStr = extModel?.MonthStr ?? 0,
-                TeacherAccountId = TeacherAccountId,
+                TeacherAccountId,
                 TeacherScore = extModel?.TeacherScore ?? 0,
                 JiaoWuScore = extModel?.JiaoWuScore ?? 0,
                 TotalScore = extModel?.TotalScore ?? 0,

Edu.Repository/User/RB_Teacher_StaticRepository.cs

@@ -29,6 +29,7 @@ SELECT DATE_FORMAT(A.Date, '%Y-%m-%d') AS Date,A.YearStr,SUM(StudentCount) AS St
 	   ,SUM(N4ClassHoursScore) AS N4ClassHoursScore,SUM(N3ClassHours) AS N3ClassHours,SUM(N3ClassHoursScore) AS N3ClassHoursScore,SUM(N2ClassHours) AS N2ClassHours,SUM(N2ClassHoursScore) AS N2ClassHoursScore
 	   ,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
+       ,SUM(SpeakClassScore) AS SpeakClassScore,SUM(SpeakVipScore) AS SpeakVipScore,SUM(GradeTestScore) AS GradeTestScore,SUM(SpeakFailScore) AS SpeakFailScore
 FROM RB_Teacher_Static AS A
 WHERE 1=1
 ");
@@ -87,6 +88,7 @@ SELECT A.TeacherId,CONCAT(DATE_FORMAT(A.Date, '%Y-%m'),'-01') AS Date,A.YearStr,
 	   ,SUM(N4ClassHoursScore) AS N4ClassHoursScore,SUM(N3ClassHours) AS N3ClassHours,SUM(N3ClassHoursScore) AS N3ClassHoursScore,SUM(N2ClassHours) AS N2ClassHours,SUM(N2ClassHoursScore) AS N2ClassHoursScore
 	   ,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
+       ,SUM(SpeakClassScore) AS SpeakClassScore,SUM(SpeakVipScore) AS SpeakVipScore,SUM(GradeTestScore) AS GradeTestScore,SUM(SpeakFailScore) AS SpeakFailScore
 FROM RB_Teacher_Static AS A
 WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00' AND A.TeacherId>0
 ");
@@ -131,6 +133,7 @@ SELECT CONCAT(DATE_FORMAT(A.Date, '%Y-%m'),'-01') AS Date,A.YearStr,SUM(StudentC
 	   ,SUM(N4ClassHoursScore) AS N4ClassHoursScore,SUM(N3ClassHours) AS N3ClassHours,SUM(N3ClassHoursScore) AS N3ClassHoursScore,SUM(N2ClassHours) AS N2ClassHours,SUM(N2ClassHoursScore) AS N2ClassHoursScore
 	   ,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
+       ,SUM(SpeakClassScore) AS SpeakClassScore,SUM(SpeakVipScore) AS SpeakVipScore,SUM(GradeTestScore) AS GradeTestScore,SUM(SpeakFailScore) AS SpeakFailScore
 FROM RB_Teacher_Static AS A
 WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
 ");
@@ -182,6 +185,7 @@ SELECT CONCAT(A.YearStr,'-01','-01') AS Date,A.YearStr,SUM(StudentCount) AS Stud
 	   ,SUM(N4ClassHoursScore) AS N4ClassHoursScore,SUM(N3ClassHours) AS N3ClassHours,SUM(N3ClassHoursScore) AS N3ClassHoursScore,SUM(N2ClassHours) AS N2ClassHours,SUM(N2ClassHoursScore) AS N2ClassHoursScore
 	   ,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
+       ,SUM(SpeakClassScore) AS SpeakClassScore,SUM(SpeakVipScore) AS SpeakVipScore,SUM(GradeTestScore) AS GradeTestScore,SUM(SpeakFailScore) AS SpeakFailScore
 FROM RB_Teacher_Static AS A 
 WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00'
 ");