移除评测scIds

TEAMModelOS.FunctionV4/CosmosDB/TriggerExam.cs

@@ -153,7 +153,7 @@ namespace TEAMModelOS.FunctionV4
                                                 classCode = "ExamClassResult-" + info.school;
                                             }
                                             cname = members.Where(m => m.id.Equals(cla)).FirstOrDefault()?.name;
-                                            ExamClassResult result = new ExamClassResult
+                                            ExamClassResult result = new()
                                             {
                                                 code = classCode,
                                                 examId = info.id,
@@ -280,7 +280,7 @@ namespace TEAMModelOS.FunctionV4
                                             {
                                                 result.mark.Add(marks);
                                                 result.studentIds.Add(sId);
-                                                result.scIds.Add(scode ?? "");
+                                                //result.scIds.Add(scode ?? "");
                                                 result.studentAnswers.Add(ans);
                                                 result.studentScores.Add(ansPoint);
                                                 result.ans.Add(anses);

TEAMModelOS.SDK/Models/Cosmos/Common/ExamClassResult.cs

@@ -34,7 +34,7 @@ namespace TEAMModelOS.SDK.Models
         public List<List<List<string>>> ans { get; set; }
         public List<List<double>> studentScores { get; set; }
         //记录学生原始学校ID
-        public List<string> scIds { get; set; } = new List<string>();
+        //public List<string> scIds { get; set; } = new List<string>();
         //继续学生作答状态
         public List<int> status { get; set; } = new List<int>();
         //批注

TEAMModelOS.SDK/Models/Service/ActivityService.cs

@@ -495,7 +495,7 @@ namespace TEAMModelOS.SDK
                                 item.studentScores.Add(ansPoint);
                                 item.studentAnswers.Add(new List<string>());
                                 item.sum.Add(0);
-                                item.scIds.Add(member.code??"");
+                                //item.scIds.Add(member.code??"");
                                 item.status.Add(0);
                             }
                             else
@@ -506,7 +506,7 @@ namespace TEAMModelOS.SDK
                                 item.studentScores.RemoveAt(index);
                                 item.studentAnswers.RemoveAt(index);
                                 item.sum.RemoveAt(index);
-                                item.scIds.RemoveAt(index);
+                                //item.scIds.RemoveAt(index);
                                 item.status.RemoveAt(index);
                             }
                             try

TEAMModelOS.SDK/Models/Service/FixDataService.cs

@@ -516,7 +516,7 @@ namespace TEAMModelOS.SDK.Models.Service
             List<Task<ItemResponse<ExamClassResult>>> tasks = new List<Task<ItemResponse<ExamClassResult>>>();
             try
             {
-                await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIterator<ExamClassResult>(queryText: $"SELECT value(c) FROM c where c.pk = 'ExamClassResult' and c._ts > 1640966400"))
+                await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIterator<ExamClassResult>(queryText: $"SELECT value(c) FROM c where c.pk = 'ExamClassResult' and c.scIds <> []"))
                 {
                     results.Add(item);
                     //await Task.WhenAll(tasks);
@@ -525,8 +525,8 @@ namespace TEAMModelOS.SDK.Models.Service
                 {
                     ids.Add(item.id);
                     List<int> status = new List<int>();
-                    List<string> classIds = new List<string>();
-                    classIds.Add(item.info.id);
+                    //List<string> classIds = new List<string>();
+                    //classIds.Add(item.info.id);
                     if (item.status.Count == 0)
                     {
                         if (item.studentAnswers.Count > 0)
@@ -535,7 +535,7 @@ namespace TEAMModelOS.SDK.Models.Service
                             {
                                 if (answer.Count == 0)
                                 {
-                                    item.status.Add(-2);
+                                    item.status.Add(1);
                                 }
                                 else
                                 {
@@ -544,7 +544,17 @@ namespace TEAMModelOS.SDK.Models.Service
                             }
                         }
                     }
-                    if (!string.IsNullOrEmpty(item.info.id) && item.scIds.Count == 0)
+                    else
+                    {
+                        List<int> vs = new();
+                        foreach (int st in item.status)
+                        {
+                            var ans = (st == -2) ? 1 : 0;
+                            vs.Add(ans);
+                        }
+                        item.status = vs;
+                    }
+                    /*if (!string.IsNullOrEmpty(item.info.id) && item.scIds.Count == 0)
                     {
                         string school = string.Empty;
                         if (item.scope.Equals("school"))
@@ -573,7 +583,7 @@ namespace TEAMModelOS.SDK.Models.Service
                             }
 
                         }
-                    }
+                    }*/
                     tasks.Add(client.GetContainer(Constant.TEAMModelOS, "Common").ReplaceItemAsync<ExamClassResult>(item, item.id, new PartitionKey(item.code)));
                 }
                 await Task.WhenAll(tasks);

TEAMModelOS/Controllers/XTest/FixDataController.cs

@@ -1586,9 +1586,9 @@ namespace TEAMModelOS.Controllers
             List<ScTeacher> teachers=  await table.FindListByDict<ScTeacher>(new Dictionary<string, object> { { "PartitionKey", "ScTeacher" } });
             List<ScTeacherDiagnosis> diagnoses = await table.FindListByDict<ScTeacherDiagnosis>(new Dictionary<string, object> { { "PartitionKey", "ScTeacherDiagnosis" } });
             List<string> rowkeys=  diagnoses.Where(z => !string.IsNullOrEmpty(z.schoolCode)).Select(x => x.RowKey).ToList();
-            List<ScTeacher> teachers = await _azureStorage.FindListByDict<ScTeacher>(new Dictionary<string, object> { { "PartitionKey", "ScTeacher" } });
+            /*List<ScTeacher> teachers = await _azureStorage.FindListByDict<ScTeacher>(new Dictionary<string, object> { { "PartitionKey", "ScTeacher" } });
             List<ScTeacherDiagnosis> diagnoses = await _azureStorage.FindListByDict<ScTeacherDiagnosis>(new Dictionary<string, object> { { "PartitionKey", "ScTeacherDiagnosis" } });
-            List<string> rowkeys = diagnoses.Where(z => !string.IsNullOrEmpty(z.schoolCode)).Select(x => x.RowKey).ToList();
+            List<string> rowkeys = diagnoses.Where(z => !string.IsNullOrEmpty(z.schoolCode)).Select(x => x.RowKey).ToList();*/
             teachers.RemoveAll(x => rowkeys.Contains(x.RowKey));
             await _dingDing.SendBotMsg($"Diagnosis :{ rowkeys.Count }", GroupNames.成都开发測試群組);
             foreach (ScTeacher teacher in teachers)

TEAMModelOS/appsettings.Development.json

@@ -27,6 +27,7 @@
     "Cosmos": {
       //"ConnectionString": "AccountEndpoint=https://teammodel.documents.azure.com:443/;AccountKey=opemBAZi0yATewIlhxDYoIEUqncT5qJh3pUBZsBkTqEkuLYTuu3VS7oaDGJlPp8ASwm5SVSrK2caJsjgmqRw9g==;"
       "ConnectionString": "AccountEndpoint=https://cdhabookdep-free.documents.azure.cn:443/;AccountKey=JTUVk92Gjsx17L0xqxn0X4wX2thDPMKiw4daeTyV1HzPb6JmBeHdtFY1MF1jdctW1ofgzqkDMFOtcqS46by31A==;"
+      //"ConnectionString": "AccountEndpoint=https://teammodelos.documents.azure.cn:443/;AccountKey=clF73GwPECfP1lKZTCvs8gLMMyCZig1HODFbhDUsarsAURO7TcOjVz6ZFfPqr1HzYrfjCXpMuVD5TlEG5bFGGg==;"
     },
     "Redis": {
       "ConnectionString": "52.130.252.100:6379,password=habook,ssl=false,abortConnect=False,writeBuffer=10240"