|
@@ -229,6 +229,7 @@ namespace TEAMModelOS.Controllers.Analysis
|
|
|
List<KeyValuePair<string, Dictionary<string, List<double>>>> gscores = new List<KeyValuePair<string, Dictionary<string, List<double>>>>();
|
|
|
//声明全科总分
|
|
|
double totalAll = 0;
|
|
|
+ List<string> stuIds = new();
|
|
|
foreach (ExamResult examResult in examResults)
|
|
|
{
|
|
|
(KeyValuePair<string, List<List<string>>> subjectData, KeyValuePair<string, List<KeyValuePair<string, List<double>>>> classSubjectData, Dictionary<string, List<double>> gscore) = DoExerciseScatteres(examResult, paperKey);
|
|
@@ -266,6 +267,10 @@ namespace TEAMModelOS.Controllers.Analysis
|
|
|
//处理个人
|
|
|
foreach (var stuid in examResult.studentIds)
|
|
|
{
|
|
|
+ if (!stuIds.Contains(stuid))
|
|
|
+ {
|
|
|
+ stuIds.Add(stuid);
|
|
|
+ }
|
|
|
StudentAys student = null;
|
|
|
int index = examResult.studentIds.IndexOf(stuid);
|
|
|
if (students.Select(x => x.id).Contains(stuid))
|
|
@@ -340,19 +345,18 @@ namespace TEAMModelOS.Controllers.Analysis
|
|
|
}*/
|
|
|
//处理班级
|
|
|
var classRes = classReses.Where(x => x.id == rGroup.id).FirstOrDefault();
|
|
|
- var stuCount = classRes.range[1] - classRes.range[0] + 1;
|
|
|
- var classStudents = students.GetRange(classRes.range[0], classRes.range[1] - classRes.range[0] + 1);
|
|
|
+ var stuCount = classRes.range[1] - classRes.range[0] + 1;
|
|
|
+ List<StudentAys> classStudents = new();
|
|
|
+ foreach (string sid in stuIds) {
|
|
|
+ foreach (var stu in students) {
|
|
|
+ if (stu.id == sid) {
|
|
|
+ classStudents.Add(stu);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } ;
|
|
|
+ //var classStudents = students.GetRange(classRes.range[0], classRes.range[1] - classRes.range[0] + 1);
|
|
|
List<double> stuTotals = classStudents.Select(x => x.total).ToList();
|
|
|
stuTotals.Sort((s1, s2) => { return s2.CompareTo(s1); });
|
|
|
-
|
|
|
- /* foreach (KeyValuePair<string, double> key1 in keys)
|
|
|
- {
|
|
|
- if (classroom.gradeId.Equals(key1.Key))
|
|
|
- {
|
|
|
- ipoint = key1.Value;
|
|
|
- }
|
|
|
- }*/
|
|
|
- //double ipoint = stuTotals[personCount];
|
|
|
//初始化进线人数
|
|
|
int lineCount = 0;
|
|
|
//初始化班级总分
|