新增知识点和认知层次结算内容返回

TEAMModelOS/Controllers/Analysis/AnalysisController.cs

@@ -469,6 +469,14 @@ namespace TEAMModelOS.Controllers.Analysis
                             passCount = passCount,
                             average = average,
                             standard = val,
+                            krate = examClassResults.FirstOrDefault(c => c.subjectId == key && c.info.id == classId).krate,
+                            phc = examClassResults.FirstOrDefault(c => c.subjectId == key && c.info.id == classId).phc,
+                            plc = examClassResults.FirstOrDefault(c => c.subjectId == key && c.info.id == classId).plc,
+                            pc = examClassResults.FirstOrDefault(c => c.subjectId == key && c.info.id == classId).pc,
+                            frate = examClassResults.FirstOrDefault(c => c.subjectId == key && c.info.id == classId).frate,
+                            fphc = examClassResults.FirstOrDefault(c => c.subjectId == key && c.info.id == classId).fphc,
+                            fplc = examClassResults.FirstOrDefault(c => c.subjectId == key && c.info.id == classId).fplc,
+                            fpc = examClassResults.FirstOrDefault(c => c.subjectId == key && c.info.id == classId).fpc,
                             sRate = paperScore[key] > 0 ? Math.Round(average / paperScore[key] * 100, 2) : 0,
                             name = info.subjects.Where(x => x.id == key).FirstOrDefault().name,
                             item = classSubjectPaperDatas.Where(subd => subd.Key == key).First().Value.Where(cls => cls.Key == classId).First().Value
@@ -572,7 +580,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 average = examResults.FirstOrDefault(c => c.id == x.id).average,
                 standard = examResults.FirstOrDefault(c => c.id == x.id).standard
             });
-            var subAll = new { sRate = info.sRate, average = info.average, standard = info.standard,total = info.stuCount };
+            var subAll = new { sRate = info.sRate, average = info.average, standard = info.standard, total = info.stuCount };
             return Ok(new
             {
                 students,
@@ -1035,7 +1043,7 @@ namespace TEAMModelOS.Controllers.Analysis
                                 int index = exam.studentIds.IndexOf(id);
                                 if (exam.studentScores[index][n] == 0)
                                 {
-                                    wrong++;                                  
+                                    wrong++;
                                     continue;
                                 }
                                 else
@@ -1133,7 +1141,7 @@ namespace TEAMModelOS.Controllers.Analysis
             return (key1, key2, key3, key4, keyValue, valuePair);
         }
 
-        
+
 
         private static (KeyValuePair<string, List<int>>, KeyValuePair<string, List<string>>, KeyValuePair<string, List<double>>, KeyValuePair<string, List<double>>, KeyValuePair<string, List<List<string>>>, KeyValuePair<string, List<KeyValuePair<string, List<double>>>>) DoLevel(ExamResult exam, ExamInfo info, List<string> keynowWrong)
         {
@@ -1192,7 +1200,7 @@ namespace TEAMModelOS.Controllers.Analysis
                 total += grade.Sum();
             }
             //试卷总分
-            double TotalPoint = point.Sum();            
+            double TotalPoint = point.Sum();
             List<double> knowScore = new List<double>();
             //得分率
             List<double> Score = new List<double>();
@@ -1231,7 +1239,7 @@ namespace TEAMModelOS.Controllers.Analysis
                             int index = exam.studentIds.IndexOf(id);
                             if (exam.studentScores[index][n] == 0)
                             {
-                                wrong++;                                
+                                wrong++;
                                 continue;
                             }
                             else

TEAMModelOS/Controllers/Analysis/ClassAys.cs

@@ -21,7 +21,7 @@ namespace TEAMModelOS.Controllers.Analysis
         public double totalAverage { get; set; }
         public double standardDeviation { get; set; }
         public string gradeId { get; set; }
-        //¼Ç¼°à¼¶µÃ·ÖÂÊ
+        //记录�级得分率
         public double csRate { get; set; }
     }
     public class AysSubject
@@ -36,6 +36,16 @@ namespace TEAMModelOS.Controllers.Analysis
         public double sRate { get; set; }
         public double standard { get; set; }
         public List<double> item { get; set; }
+        //知识点结算内容
+        public List<double> krate { get; set; } = new List<double>();
+        public List<int> phc { get; set; } = new List<int>();
+        public List<int> plc { get; set; } = new List<int>();
+        public List<int> pc { get; set; } = new List<int>();
+        //认知层次结算内容
+        public List<double> frate { get; set; } = new List<double>();
+        public List<int> fphc { get; set; } = new List<int>();
+        public List<int> fplc { get; set; } = new List<int>();
+        public List<int> fpc { get; set; } = new List<int>();
 
     }
 }