返回内容调整

TEAMModelOS/Controllers/Common/ExamController.cs

@@ -1560,8 +1560,24 @@ namespace TEAMModelOS.Controllers
                 {
                     //var obj = new { stuId = ss.stuId, examId = ss.examId, subjectId = ss.subjectId, };
                     //ss.items.Add(ss.items.Where(x => x.scores.))
-                    var scc = ss.items.SelectMany(p => p.scores, (p, d) => new { p.ssc, d.sc, d.tmdId }).Where(x => x.tmdId.Equals(tId.GetString())).Select(m => new { m.sc ,m.ssc});
-                    var obj = new { ss.stuId, ss.examId, ss.subjectId, item = scc, ss.blob, ss.tIds, ss.marks, ss.scores, ss.model, ss.mode };
+                    //var scc = ss.items.SelectMany(p => p.scores, (p, d) => new { p.ssc, d.sc, d.tmdId }).Where(x => x.tmdId.Equals(tId.GetString())).Select(m => new { m.sc ,m.ssc});
+                    List<dynamic> sc = new List<dynamic>();
+                    foreach (Item item in ss.items)
+                    {
+                        List<double> scc = item.scores.Where(x => x.tmdId.Equals(tId.GetString())).Select(c => c.sc).ToList();
+                        //item.scores.Where(x => x.tmdId.Equals(tId.GetString())).SelectMany(p => p.sc, (p, d) => new { });
+                        if (scc.Count > 0)
+                        {
+                            sc.Add(new { sc = scc.FirstOrDefault(), item.ssc });
+                        }
+                        else
+                        {
+                            sc.Add(new { sc = -1, item.ssc });
+                        }
+                        //sc.Add(item.scores.Where(x => x.tmdId.Equals(tId.GetString())).Select(c => c.sc).FirstOrDefault());
+                        //item.scores = item.scores.Where(x => x.tmdId.Equals(tId.GetString())).ToList();
+                    }
+                    var obj = new { ss.stuId, ss.examId, ss.subjectId, item = sc, ss.blob, ss.tIds, ss.marks, ss.scores, ss.model, ss.mode };
                     objs.Add(obj);
                 }
                 return Ok(new { objs, paper = info.papers[index].blob });
@@ -1686,24 +1702,24 @@ namespace TEAMModelOS.Controllers
                     List<SDK.Models.Cosmos.Common.Scoring> val = new List<SDK.Models.Cosmos.Common.Scoring>();
                     foreach (SDK.Models.Cosmos.Common.Scoring ss in value)
                     {
-                        var scc = ss.items.SelectMany(p => p.scores, (p, d) => new { p.ssc, d.sc, d.tmdId }).Where(x => x.tmdId.Equals(tId.GetString())).Select(m => new { m.sc, m.ssc });
-                        /*List<double> sc = new List<double>();
+                        //var scc = ss.items.SelectMany(p => p.scores, (p, d) => new { p.ssc, d.sc, d.tmdId }).Where(x => x.tmdId.Equals(tId.GetString())).Select(m => new { m.sc, m.ssc });
+                        List<dynamic> sc = new List<dynamic>();
                         foreach (Item item in ss.items)
                         {
                             List<double> scc = item.scores.Where(x => x.tmdId.Equals(tId.GetString())).Select(c => c.sc).ToList();
                             //item.scores.Where(x => x.tmdId.Equals(tId.GetString())).SelectMany(p => p.sc, (p, d) => new { });
-*//*                            if (scc.Count > 0)
+                            if (scc.Count > 0)
                             {
-                                sc.Add(scc.FirstOrDefault());
+                                sc.Add(new { sc = scc.FirstOrDefault(),item.ssc});
                             }
                             else
                             {
-                                sc.Add(-1);
-                            }*//*
+                                sc.Add(new { sc = -1 ,item.ssc});
+                            }
                             //sc.Add(item.scores.Where(x => x.tmdId.Equals(tId.GetString())).Select(c => c.sc).FirstOrDefault());
                             //item.scores = item.scores.Where(x => x.tmdId.Equals(tId.GetString())).ToList();
-                        }*/
-                        var obj = new { ss.stuId, ss.examId, ss.subjectId, item = scc, ss.blob, ss.tIds, ss.marks, ss.scores, ss.model, ss.mode };
+                        }
+                        var obj = new { ss.stuId, ss.examId, ss.subjectId, item = sc, ss.blob, ss.tIds, ss.marks, ss.scores, ss.model, ss.mode };
                         objs.Add(obj);
                     }
                     return Ok(objs);