zhouj1203@hotmail.com 1 year ago
parent
commit
7b0b57e0a6

+ 12 - 1
TEAMModelOS.FunctionV4/CosmosDB/TriggerExam.cs

@@ -862,6 +862,9 @@ namespace TEAMModelOS.FunctionV4
             var addTmdidsCls = tchList.FindAll(x => x.type == 1);
             List<StuActivity> stuActivities = new List<StuActivity>();
             List<StuActivity> tmdActivities = new List<StuActivity>();
+            var papers = info.papers.GroupBy(c => c.subjectId).Select(x => new { 
+                subject =  x.Key,
+                blob = x.ToList().Select(z => z.blob).ToList() });
             if (addTmdidsCls.IsNotEmpty())
             {
                 addTmdidsCls.ForEach(x =>
@@ -928,6 +931,10 @@ namespace TEAMModelOS.FunctionV4
                         creatorId = info.creatorId,
                         subjects = sub,
                         blob = null,
+                        paper = info.pk.Equals("Art") ? papers.Select(c => new {
+                            c.subject,
+                            blob = c.blob[new Random().Next(c.blob.Count)]
+                        }) : "",
                         owner = info.owner,
                         createTime = info.createTime,
                         taskStatus = ts,
@@ -937,7 +944,7 @@ namespace TEAMModelOS.FunctionV4
                         sStatus = iss ? 1 : 0,
                         classIds = classIds.ToList()
 
-                    });
+                    }); ;
                 });
             }
             if (addStudentsCls.IsNotEmpty())
@@ -1007,6 +1014,10 @@ namespace TEAMModelOS.FunctionV4
                         creatorId = info.creatorId,
                         subjects = sub,
                         blob = null,
+                        paper = info.pk.Equals("Art") ? papers.Select(c => new {
+                            c.subject,
+                            blob = c.blob[new Random().Next(c.blob.Count)]
+                        }) : "",
                         owner = info.owner,
                         classIds = classIds.ToList(),
                         createTime = info.createTime,

+ 1 - 0
TEAMModelOS.SDK/Models/Cosmos/Common/StuActivity.cs

@@ -58,6 +58,7 @@ namespace TEAMModelOS.SDK.Models
         public string creatorId { get; set; }
         public List<string> subjects { get; set; }
         public string blob { get; set; }
+        public dynamic paper { get; set; } 
         public string recordUrl { get; set; }
         public List<string> classIds { get; set; } = new List<string>();
         

+ 1 - 0
TEAMModelOS.SDK/Models/Cosmos/School/ExamInfo.cs

@@ -142,6 +142,7 @@ namespace TEAMModelOS.SDK.Models
     }
     public class PaperSimple { 
         public string id { get; set; }
+        public string subjectId { get; set; }
         public string code { get; set; }
         //标记试卷来源学段
         public string periodId { get; set; }