zhouj1203@hotmail.com 1 year ago
parent
commit
5e8c00d940

+ 7 - 0
TEAMModelOS.FunctionV4/CosmosDB/TriggerExam.cs

@@ -324,6 +324,10 @@ namespace TEAMModelOS.FunctionV4
                                                 ids.Add((member.id, member.code));
                                             }
                                             //ids = members.Where(c => c.id.Equals(cla)).SelectMany(m => m.members).Select(g => g.id).ToList();
+                                            List<string> blobs = new();
+                                            if (info.qamode == 2) {
+                                                blobs =  info.papers.Where(c => c.subjectId.Equals(subject.id)).Select(c => c.blob).ToList();
+                                            }
                                             foreach (var (sId, scode) in ids)
                                             {
                                                 result.mark.Add(marks);
@@ -334,6 +338,9 @@ namespace TEAMModelOS.FunctionV4
                                                 result.ans.Add(anses);
                                                 result.sum.Add(0);
                                                 result.status.Add(1);
+                                                if (info.qamode == 2) {
+                                                    result.paper.Add(blobs[new Random().Next(blobs.Count)]);
+                                                }                                              
                                             }
 
                                             //result.progress = info.progress;

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

@@ -57,6 +57,7 @@ namespace TEAMModelOS.SDK.Models
         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>();
+        public List<string> paper { get; set; }= new List<string>();
     }
 /*    public class PaperSimple {
         public string id { get; set; }

+ 2 - 2
TEAMModelOS.SDK/Models/Service/StudentService.cs

@@ -219,11 +219,11 @@ namespace TEAMModelOS.SDK
                     subjectSQL = $" and  c.id in ({string.Join(",", subjects.Select(z => $"'{z}'"))}) ";
                 }
 
-                StringBuilder SQL = new StringBuilder($"select {filed} from c  {subjectJoin} where c.pk='Art' {subjectSQL} {groupListSQL} and c.startTime>={stime} and c.startTime <= {etime} ");
+                StringBuilder SQL = new($"select {filed} from c  {subjectJoin} where c.pk='Art' {subjectSQL} {groupListSQL} and c.startTime>={stime} and c.startTime <= {etime} ");
                 //获取学校发布的活动
                 if (userScope.Equals(Constant.ScopeStudent) && !string.IsNullOrWhiteSpace(school))
                 {
-                    var resultSchool = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Common).GetList<StudentActivity>($"{SQL.ToString()}  and c.school='school' ", $"Art-{school}");
+                    var resultSchool = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Common).GetList<StudentActivity>($"{SQL}  and c.school='school' ", $"Art-{school}");
                     activities.AddRange(resultSchool.list);
                 }
             }