Merge branch 'develop3.0' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop3.0

TEAMModelOS/Controllers/Analysis/AchievementController.cs

@@ -1245,6 +1245,7 @@ namespace TEAMModelOS.Controllers.Analysis
             //说明 同学校、同类型考试数据
             List<ExamInfo> exams = await azureCosmosDBRepository.FindByDict<ExamInfo>(request.@params);
             HashSet<string> classList = new HashSet<string>();
+            HashSet<string> subjectList = new HashSet<string>();
             List<List<List<string>>> AllPoint = new List<List<List<string>>>();
             List<List<List<string>>> AllPointAverage = new List<List<List<string>>>();
             List<List<List<string>>> AllKeyLine = new List<List<List<string>>>();
@@ -1255,8 +1256,6 @@ namespace TEAMModelOS.Controllers.Analysis
                 {
                     { "ExamCode",  e.id}
                 };
-                double weight = 0.5;
-                weightSum += weight;
                 List<string> subjects = new List<string>();
                 List<List<string>> SubjectClassAverage = new List<List<string>>();
                 List<List<string>> SubjectAverage = new List<List<string>>();
@@ -1271,6 +1270,9 @@ namespace TEAMModelOS.Controllers.Analysis
                 iPersons = stuCount * 0.4;
                 //
                 List<List<int>> subSum = new List<List<int>>();
+                if (simples.IsEmpty()) continue;
+                double weight = 0.5;
+                weightSum += weight;
                 int classLen = simples[0].Classes.Count;
                 for (int cls = 0; cls < classLen; cls++)
                 {
@@ -1294,6 +1296,7 @@ namespace TEAMModelOS.Controllers.Analysis
                         { "name", s.Subject }
                     };
                     subjects.Add(s.Subject);
+                    subjectList.Add(s.Subject);
                     //计算试卷总分
                     int sum = s.Point.Sum();
                     //int stuSum = 0;
@@ -1423,6 +1426,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 }
                 AveragePoint.Add(SubjectAverage);
             }
+            
             //每个班级成就指标
             int p = AllPointAverage.Count;
             for (int m = 0; m < AllPointAverage[0].Count; m++)
@@ -1450,6 +1454,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 }
                 ClassCore.Add(startAverage / weightSum);
             }
+           
             //班级平均进线率
             int ExamCount = AllKeyLine.Count;
             List<List<double>> KeyLines = new List<List<double>>();
@@ -1467,7 +1472,17 @@ namespace TEAMModelOS.Controllers.Analysis
                 }
                 KeyLines.Add(ClassLine);
             }
-            builder.Data(KeyLines);
+            Dictionary<string, object> AveragePointMap = new Dictionary<string, object>
+            {
+                { "index", index},
+                { "className", classList },
+                { "subjectName", subjectList },
+                { "AveragePoint", AveragePoint },
+                //{ "AverageClassPoint", AverageClassPoint },
+                { "ClassCore", ClassCore },
+                { "KeyLines",KeyLines}
+             };
+            builder.Data(AveragePointMap);
             return builder.build();
         }
     }