Skip to content

E
Education
Commit 7a05583c authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 155e9f2d
Show whitespace changes
Inline Side-by-side
Showing with 769 additions and 616 deletions
Edu.Model/Entity/User/RB_Teacher_Static.cs
View file @ 7a05583c
...@@ -21,7 +21,7 @@ namespace Edu.Model.Entity.User ...@@ -21,7 +21,7 @@ namespace Edu.Model.Entity.User
public DateTime Date { get; set; } public DateTime Date { get; set; }
/// <summary> /// <summary>
/// 学生人数 /// 学生人次
/// </summary> /// </summary>
public decimal StudentCount { get; set; } public decimal StudentCount { get; set; }
...@@ -254,5 +254,26 @@ namespace Edu.Model.Entity.User ...@@ -254,5 +254,26 @@ namespace Edu.Model.Entity.User
/// 教师编号 /// 教师编号
/// </summary> /// </summary>
public int TeacherId { get; set; } 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
View file @ 7a05583c
...@@ -368,7 +368,7 @@ namespace Edu.Module.User ...@@ -368,7 +368,7 @@ namespace Edu.Module.User
Id = extModel?.Id ?? 0, Id = extModel?.Id ?? 0,
YearStr = extModel?.YearStr ?? 0, YearStr = extModel?.YearStr ?? 0,
MonthStr = extModel?.MonthStr ?? 0, MonthStr = extModel?.MonthStr ?? 0,
TeacherAccountId = TeacherAccountId, TeacherAccountId,
TeacherScore = extModel?.TeacherScore ?? 0, TeacherScore = extModel?.TeacherScore ?? 0,
JiaoWuScore = extModel?.JiaoWuScore ?? 0, JiaoWuScore = extModel?.JiaoWuScore ?? 0,
TotalScore = extModel?.TotalScore ?? 0, TotalScore = extModel?.TotalScore ?? 0,
......
Edu.Module.User/TeacherStaticModule.cs
View file @ 7a05583c
This source diff could not be displayed because it is too large. You can view the blob instead.
Edu.Repository/User/RB_Teacher_StaticRepository.cs
View file @ 7a05583c
...@@ -29,6 +29,7 @@ SELECT DATE_FORMAT(A.Date, '%Y-%m-%d') AS Date,A.YearStr,SUM(StudentCount) AS St ...@@ -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(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(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(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 FROM RB_Teacher_Static AS A
WHERE 1=1 WHERE 1=1
"); ");
...@@ -87,6 +88,7 @@ SELECT A.TeacherId,CONCAT(DATE_FORMAT(A.Date, '%Y-%m'),'-01') AS Date,A.YearStr, ...@@ -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(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(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(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 FROM RB_Teacher_Static AS A
WHERE 1=1 AND A.Date<>'0001-01-01 00:00:00' AND A.TeacherId>0 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 ...@@ -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(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(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(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 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'
"); ");
...@@ -182,6 +185,7 @@ SELECT CONCAT(A.YearStr,'-01','-01') AS Date,A.YearStr,SUM(StudentCount) AS Stud ...@@ -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(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(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(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 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'
"); ");
......
Edu.WebApi/Controllers/User/TeacherStaticController.cs
View file @ 7a05583c
...@@ -74,20 +74,23 @@ namespace Edu.WebApi.Controllers.User ...@@ -74,20 +74,23 @@ namespace Edu.WebApi.Controllers.User
ExcelRows = new List<ExcelColumn>() ExcelRows = new List<ExcelColumn>()
{ {
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=10}, //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("试讲成功(班课)"){ CellWidth=15},
new ExcelColumn("试讲成功(VIP)"){ 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("老师迟到早退(次)"){ CellWidth=15}, new ExcelColumn("老师迟到早退(次)"){ CellWidth=15},
new ExcelColumn("N5课程时数"){ CellWidth=15}, //new ExcelColumn("N5课程时数"){ CellWidth=15},
new ExcelColumn("N4课程时数"){ CellWidth=15}, //new ExcelColumn("N4课程时数"){ CellWidth=15},
new ExcelColumn("N3课程时数"){ CellWidth=15}, //new ExcelColumn("N3课程时数"){ CellWidth=15},
new ExcelColumn("N2课程时数"){ CellWidth=15}, new ExcelColumn("N2课程时数"){ CellWidth=15},
new ExcelColumn("N1课程时数"){ CellWidth=15}, new ExcelColumn("N1课程时数"){ CellWidth=15},
new ExcelColumn("学生小程序刷题次数"){ CellWidth=15}, new ExcelColumn("学生小程序刷题次数"){ CellWidth=15},
...@@ -108,18 +111,21 @@ namespace Edu.WebApi.Controllers.User ...@@ -108,18 +111,21 @@ namespace Edu.WebApi.Controllers.User
}; };
columns.Add(new ExcelColumn(dObj.GetStringValue("StudentCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("StudentCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("AttendClassHourScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("AttendClassHourScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("OnLineInteractiveScore"))); //columns.Add(new ExcelColumn(dObj.GetStringValue("OnLineInteractiveScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("RenewScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("RenewScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("UpgradeScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("UpgradeScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("GradeTestScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("TransScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("TransScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("TrialSpeakScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("SpeakClassScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("SpeakVipScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("SpeakFailScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("TruancyScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("TruancyScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("WithdrawsScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("WithdrawsScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ComplaintScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("ComplaintScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("TeacherBeLateScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("TeacherBeLateScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("N5ClassHoursScore"))); //columns.Add(new ExcelColumn(dObj.GetStringValue("N5ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("N4ClassHoursScore"))); //columns.Add(new ExcelColumn(dObj.GetStringValue("N4ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("N3ClassHoursScore"))); //columns.Add(new ExcelColumn(dObj.GetStringValue("N3ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("N2ClassHoursScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("N2ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("N1ClassHoursScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("N1ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("MiniAppPractiseScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("MiniAppPractiseScore")));
...@@ -189,21 +195,24 @@ namespace Edu.WebApi.Controllers.User ...@@ -189,21 +195,24 @@ namespace Edu.WebApi.Controllers.User
ExcelRows = new List<ExcelColumn>() ExcelRows = new List<ExcelColumn>()
{ {
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("线上与学生互动数"){ CellWidth=10}, //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("试讲成功(班课)"){ CellWidth=15},
new ExcelColumn("试讲成功(VIP)"){ 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("老师迟到早退(次)"){ CellWidth=15}, new ExcelColumn("老师迟到早退(次)"){ CellWidth=15},
new ExcelColumn("N5课程时数"){ CellWidth=15}, //new ExcelColumn("N5课程时数"){ CellWidth=15},
new ExcelColumn("N4课程时数"){ CellWidth=15}, //new ExcelColumn("N4课程时数"){ CellWidth=15},
new ExcelColumn("N3课程时数"){ CellWidth=15}, //new ExcelColumn("N3课程时数"){ CellWidth=15},
new ExcelColumn("N2课程时数"){ CellWidth=15}, new ExcelColumn("N2课程时数"){ CellWidth=15},
new ExcelColumn("N1课程时数"){ CellWidth=15}, new ExcelColumn("N1课程时数"){ CellWidth=15},
new ExcelColumn("学生小程序刷题次数"){ CellWidth=15}, new ExcelColumn("学生小程序刷题次数"){ CellWidth=15},
...@@ -226,18 +235,21 @@ namespace Edu.WebApi.Controllers.User ...@@ -226,18 +235,21 @@ namespace Edu.WebApi.Controllers.User
columns.Add(new ExcelColumn(dObj.GetStringValue("StudentCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("StudentCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("FinishTimes") + "/" + dObj.GetStringValue("FollowCount"))); columns.Add(new ExcelColumn(dObj.GetStringValue("FinishTimes") + "/" + dObj.GetStringValue("FollowCount")));
columns.Add(new ExcelColumn(dObj.GetStringValue("AttendClassHourScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("AttendClassHourScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("OnLineInteractiveScore"))); //columns.Add(new ExcelColumn(dObj.GetStringValue("OnLineInteractiveScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("RenewScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("RenewScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("UpgradeScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("UpgradeScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("GradeTestScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("TransScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("TransScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("TrialSpeakScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("SpeakClassScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("SpeakVipScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("SpeakFailScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("TruancyScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("TruancyScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("WithdrawsScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("WithdrawsScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ComplaintScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("ComplaintScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("TeacherBeLateScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("TeacherBeLateScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("N5ClassHoursScore"))); //columns.Add(new ExcelColumn(dObj.GetStringValue("N5ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("N4ClassHoursScore"))); //columns.Add(new ExcelColumn(dObj.GetStringValue("N4ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("N3ClassHoursScore"))); //columns.Add(new ExcelColumn(dObj.GetStringValue("N3ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("N2ClassHoursScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("N2ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("N1ClassHoursScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("N1ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("MiniAppPractiseScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("MiniAppPractiseScore")));
...@@ -306,20 +318,23 @@ namespace Edu.WebApi.Controllers.User ...@@ -306,20 +318,23 @@ namespace Edu.WebApi.Controllers.User
ExcelRows = new List<ExcelColumn>() ExcelRows = new List<ExcelColumn>()
{ {
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=10}, //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("试讲成功(班课)"){ CellWidth=15},
new ExcelColumn("试讲成功(VIP)"){ 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("老师迟到早退(次)"){ CellWidth=15}, new ExcelColumn("老师迟到早退(次)"){ CellWidth=15},
new ExcelColumn("N5课程时数"){ CellWidth=15}, //new ExcelColumn("N5课程时数"){ CellWidth=15},
new ExcelColumn("N4课程时数"){ CellWidth=15}, //new ExcelColumn("N4课程时数"){ CellWidth=15},
new ExcelColumn("N3课程时数"){ CellWidth=15}, //new ExcelColumn("N3课程时数"){ CellWidth=15},
new ExcelColumn("N2课程时数"){ CellWidth=15}, new ExcelColumn("N2课程时数"){ CellWidth=15},
new ExcelColumn("N1课程时数"){ CellWidth=15}, new ExcelColumn("N1课程时数"){ CellWidth=15},
new ExcelColumn("学生小程序刷题次数"){ CellWidth=15}, new ExcelColumn("学生小程序刷题次数"){ CellWidth=15},
...@@ -343,15 +358,18 @@ namespace Edu.WebApi.Controllers.User ...@@ -343,15 +358,18 @@ namespace Edu.WebApi.Controllers.User
columns.Add(new ExcelColumn(dObj.GetStringValue("OnLineInteractiveScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("OnLineInteractiveScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("RenewScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("RenewScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("UpgradeScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("UpgradeScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("GradeTestScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("TransScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("TransScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("TrialSpeakScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("SpeakClassScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("SpeakVipScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("SpeakFailScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("TruancyScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("TruancyScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("WithdrawsScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("WithdrawsScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("ComplaintScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("ComplaintScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("TeacherBeLateScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("TeacherBeLateScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("N5ClassHoursScore"))); //columns.Add(new ExcelColumn(dObj.GetStringValue("N5ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("N4ClassHoursScore"))); //columns.Add(new ExcelColumn(dObj.GetStringValue("N4ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("N3ClassHoursScore"))); //columns.Add(new ExcelColumn(dObj.GetStringValue("N3ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("N2ClassHoursScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("N2ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("N1ClassHoursScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("N1ClassHoursScore")));
columns.Add(new ExcelColumn(dObj.GetStringValue("MiniAppPractiseScore"))); columns.Add(new ExcelColumn(dObj.GetStringValue("MiniAppPractiseScore")));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment