Skip to content

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

页面修改

parent 1d9d9ba1
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 26 deletions
Edu.Module.User/TeacherStaticModule.cs
View file @ e4ceb88f
......@@ -398,7 +398,8 @@ namespace Edu.Module.User
};
}
firstModel = item;
firstModel.TotalScore = (firstModel.StudentCount + firstModel.AttendClassHourScore + firstModel.RenewScore
//+ firstModel.AttendClassHourScore
firstModel.TotalScore = (firstModel.StudentCount + firstModel.RenewScore
+ firstModel.UpgradeScore + firstModel.TransScore + firstModel.TrialSpeakScore - firstModel.TruancyScore - firstModel.WithdrawsScore - firstModel.ComplaintScore
- firstModel.TeacherBeLateScore
+ firstModel.N2ClassHoursScore * 1 + firstModel.N1ClassHoursScore * 1 + firstModel.MiniAppPractiseScore + firstModel.MiniAppTimeScore
......@@ -411,13 +412,10 @@ namespace Edu.Module.User
index++;
}
if (item.TotalFollow > 0)
{
item.OnLineInteractive = Math.Round((Convert.ToDecimal(item.FinishFollow) / Convert.ToDecimal(item.TotalFollow) * 10), 2);
}
item.OnLineInteractive = GetTeacherAndStudentScore(item.FinishFollow, item.TotalFollow);
item.OnLineInteractiveScore = item.OnLineInteractive;
item.TotalScore = (item.StudentCount + item.AttendClassHourScore + item.RenewScore
//+ item.AttendClassHourScore
item.TotalScore = (item.StudentCount + item.RenewScore
+ item.UpgradeScore + item.TransScore + item.TrialSpeakScore - item.TruancyScore - item.WithdrawsScore - item.ComplaintScore
- item.TeacherBeLateScore
+ item.N2ClassHoursScore * 1 + item.N1ClassHoursScore * 1 + item.MiniAppPractiseScore + item.MiniAppTimeScore
......@@ -592,19 +590,15 @@ namespace Edu.Module.User
var tempAssessment = teacherAssessmentList?.Where(qitem => qitem.TeacherId == item.TeacherId)?.FirstOrDefault();
item.AssessmentScore = tempAssessment?.TotalScore ?? 0;
item.OnLineInteractive = 0;
if (item.TotalFollow > 0)
{
item.OnLineInteractive = Math.Round((Convert.ToDecimal(item.FinishFollow) / Convert.ToDecimal(item.TotalFollow) * 10), 2);
}
item.OnLineInteractive = GetTeacherAndStudentScore(item.FinishFollow, item.TotalFollow);
item.OnLineInteractiveScore = item.OnLineInteractive;
item.TotalScore = (item.StudentCount + item.AttendClassHourScore + item.RenewScore
//+ item.AttendClassHourScore
item.TotalScore = (item.StudentCount + item.RenewScore
+ item.UpgradeScore + item.TransScore + item.TrialSpeakScore - item.TruancyScore - item.WithdrawsScore - item.ComplaintScore
- item.TeacherBeLateScore + item.MiniAppPractiseScore + item.MiniAppTimeScore
+ item.N2ClassHoursScore * 1 + item.N1ClassHoursScore * 1
+ item.ActivityNum +item.OnLineInteractiveScore+ item.AssessmentScore
+ item.SpeakClassScore + item.SpeakVipScore * 2 - item.SpeakFailScore + item.GradeTestScore
);
}
......@@ -623,7 +617,10 @@ namespace Edu.Module.User
teacherCount = list.Where(qitem => qitem.TotalScore > 0 && teacherIds.Contains(item.TeacherId.ToString())).Count();
tempDataList = list.Where(qitem => teacherIds.Contains(item.TeacherId.ToString()))?.ToList();
}
if (teacherCount <= 0)
{
teacherCount = 1;
}
item.AvgScore = Math.Round((tempDataList?.Sum(qitem => qitem.TotalScore) ?? 0) / teacherCount, 2);
item.ScoreGap = item.TotalScore - item.AvgScore;
dataList.Add(new
......@@ -740,6 +737,31 @@ namespace Edu.Module.User
return dataList;
}
/// <summary>
/// 计算班主任与学生互动得分
/// </summary>
/// <param name="FinishFollow"></param>
/// <param name="TotalFollow"></param>
/// <returns></returns>
public decimal GetTeacherAndStudentScore(decimal FinishFollow,decimal TotalFollow)
{
decimal score = 0;
if (TotalFollow > 0)
{
decimal stepScore = 2;
if (TotalFollow > 20 && TotalFollow < 40)
{
stepScore = 5;
}
if (TotalFollow >= 40)
{
stepScore = 10;
}
score= Math.Round(FinishFollow / TotalFollow * stepScore, 2);
}
return score;
}
/// <summary>
/// 教师行为数据月份统计
/// </summary>
......@@ -2949,10 +2971,7 @@ namespace Edu.Module.User
FinishFollow= procModel?.FinishFollow??0,
TotalFollow = procModel?.TotalFollow ?? 0,
};
if (newModel.TotalFollow > 0)
{
newModel.OnLineInteractive = Math.Round((Convert.ToDecimal(newModel.FinishFollow) / Convert.ToDecimal(newModel.TotalFollow) * 10), 2);
}
newModel.OnLineInteractive = GetTeacherAndStudentScore(newModel.FinishFollow, newModel.TotalFollow);
newModel.OnLineInteractive = newModel.OnLineInteractiveScore;
//newModel.N5ClassHours = procModel?.N5ClassHours ?? 0;
//newModel.N5ClassHoursScore = procModel?.N5ClassHoursScore ?? 0;
......@@ -3326,17 +3345,13 @@ namespace Edu.Module.User
MonthStr = newDate.Month,
TeacherId = 0,
};
if (newModel2.TotalFollow > 0)
{
newModel2.OnLineInteractive = Math.Round((Convert.ToDecimal(newModel2.FinishFollow) / Convert.ToDecimal(newModel2.TotalFollow) * 10), 2);
}
newModel2.OnLineInteractive = GetTeacherAndStudentScore(newModel2.FinishFollow, newModel2.TotalFollow);
newModel2.OnLineInteractiveScore = newModel2.OnLineInteractive;
newModel2.TeacherBeLate = checkList?.Where(qitem => qitem.ExceptionCount > 0)?.Count() ?? 0;
newModel2.TeacherBeLateScore = newModel2.TeacherBeLate;
newModel2.TotalScore = (newModel2.StudentCount + newModel2.AttendClassHourScore + newModel2.RenewScore
//+ newModel2.AttendClassHourScore
newModel2.TotalScore = (newModel2.StudentCount + newModel2.RenewScore
+ newModel2.UpgradeScore + newModel2.TransScore + newModel2.TrialSpeakScore - newModel2.TruancyScore - newModel2.WithdrawsScore - newModel2.ComplaintScore
- newModel2.TeacherBeLateScore + newModel2.MiniAppPractiseScore + newModel2.MiniAppTimeScore
+ newModel2.ActivityNum + newModel2.N2ClassHoursScore * 1 + newModel2.N1ClassHoursScore * 1
......
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