Skip to content

E
Education
Commit 4da1811e authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent e8889ae9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 10 deletions
Edu.Module.User/TeacherStaticModule.cs
View file @ 4da1811e
...@@ -412,8 +412,7 @@ namespace Edu.Module.User ...@@ -412,8 +412,7 @@ namespace Edu.Module.User
index++; index++;
} }
item.OnLineInteractive = GetTeacherAndStudentScore(item.FinishFollow, item.TotalFollow); item.OnLineInteractiveScore = GetTeacherAndStudentScore(item.FinishFollow, item.TotalFollow);
item.OnLineInteractiveScore = item.OnLineInteractive;
//+ item.AttendClassHourScore //+ item.AttendClassHourScore
item.TotalScore = (item.StudentCount + item.RenewScore item.TotalScore = (item.StudentCount + item.RenewScore
+ item.UpgradeScore + item.TransScore + item.TrialSpeakScore - item.TruancyScore - item.WithdrawsScore - item.ComplaintScore + item.UpgradeScore + item.TransScore + item.TrialSpeakScore - item.TruancyScore - item.WithdrawsScore - item.ComplaintScore
...@@ -586,13 +585,9 @@ namespace Edu.Module.User ...@@ -586,13 +585,9 @@ namespace Edu.Module.User
{ {
foreach (var item in list) foreach (var item in list)
{ {
var tempAssessment = teacherAssessmentList?.Where(qitem => qitem.TeacherId == item.TeacherId)?.FirstOrDefault(); var tempAssessment = teacherAssessmentList?.Where(qitem => qitem.TeacherId == item.TeacherId)?.FirstOrDefault();
item.AssessmentScore = tempAssessment?.TotalScore ?? 0; item.AssessmentScore = tempAssessment?.TotalScore ?? 0;
item.OnLineInteractive = 0; item.OnLineInteractiveScore = GetTeacherAndStudentScore(item.FinishFollow, item.TotalFollow);
item.OnLineInteractive = GetTeacherAndStudentScore(item.FinishFollow, item.TotalFollow);
item.OnLineInteractiveScore = item.OnLineInteractive;
//+ item.AttendClassHourScore
item.TotalScore = (item.StudentCount + item.RenewScore item.TotalScore = (item.StudentCount + item.RenewScore
+ item.UpgradeScore + item.TransScore + item.TrialSpeakScore - item.TruancyScore - item.WithdrawsScore - item.ComplaintScore + item.UpgradeScore + item.TransScore + item.TrialSpeakScore - item.TruancyScore - item.WithdrawsScore - item.ComplaintScore
- item.TeacherBeLateScore + item.MiniAppPractiseScore + item.MiniAppTimeScore - item.TeacherBeLateScore + item.MiniAppPractiseScore + item.MiniAppTimeScore
...@@ -601,10 +596,8 @@ namespace Edu.Module.User ...@@ -601,10 +596,8 @@ namespace Edu.Module.User
+ item.SpeakClassScore + item.SpeakVipScore * 2 - item.SpeakFailScore + item.GradeTestScore + item.SpeakClassScore + item.SpeakVipScore * 2 - item.SpeakFailScore + item.GradeTestScore
); );
} }
foreach (var item in list) foreach (var item in list)
{ {
var tempAssessment = teacherAssessmentList?.Where(qitem => qitem.TeacherId == item.TeacherId)?.FirstOrDefault(); var tempAssessment = teacherAssessmentList?.Where(qitem => qitem.TeacherId == item.TeacherId)?.FirstOrDefault();
int teacherCount = 1; int teacherCount = 1;
var teacherModel = teacherList.FirstOrDefault(qitem => qitem.AccountId == item.TeacherId); var teacherModel = teacherList.FirstOrDefault(qitem => qitem.AccountId == item.TeacherId);
......
Edu.WebApi/Controllers/User/TeacherStaticController.cs
View file @ 4da1811e
...@@ -650,7 +650,7 @@ namespace Edu.WebApi.Controllers.User ...@@ -650,7 +650,7 @@ namespace Edu.WebApi.Controllers.User
{ {
StartTime = Common.ConvertHelper.FormatDate(DateTime.Now); StartTime = Common.ConvertHelper.FormatDate(DateTime.Now);
} }
StartTime = "2021-12-21"; StartTime = "2022-04-21";
string EndTime = Common.ConvertHelper.FormatDate(DateTime.Now); string EndTime = Common.ConvertHelper.FormatDate(DateTime.Now);
Task.Run(() => Task.Run(() =>
{ {
......
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