CrazyIter_Bin 3 роки тому
батько
коміт
24624ffd01

+ 2 - 1
TEAMModelOS.FunctionV4/ServiceBus/ActiveTaskTopic.cs

@@ -1121,6 +1121,7 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
                                     if (groupLists.IsNotEmpty() && !string.IsNullOrWhiteSpace(lessonRecord.periodId))
                                     {
                                         try {
+                                            var gplist = groupLists.FindAll(x => lessonRecord.groupIds.Contains(x.id));
                                             School schoolObj = await client.GetContainer(Constant.TEAMModelOS, "School").ReadItemAsync<School>(lessonRecord.school, new PartitionKey("Base"));
                                             //年级算法
                                             var period = schoolObj.period.Find(x => x.id.Equals(lessonRecord.periodId));
@@ -1129,7 +1130,7 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
                                             {
                                                 int Month = DateTimeOffset.UtcNow.Month;
                                                 int Year = DateTimeOffset.UtcNow.Year;
-                                                foreach (int year in groupLists.Select(x => x.year))
+                                                foreach (int year in gplist.Select(x => x.year))
                                                 {
                                                     int grade;
                                                     if (Month >= 1 && Month <= 6)

+ 2 - 2
TEAMModelOS/Controllers/XTest/FixDataController.cs

@@ -1868,9 +1868,9 @@ namespace TEAMModelOS.Controllers
         public async Task<IActionResult> FixSchoolLessonRecord(JsonElement json)
         {
             var client = _azureCosmos.GetCosmosClient();
-            string sql = " SELECT distinct value(c)  FROM c  where c.pk='LessonRecord'";
+            string sql = " SELECT distinct value(c)  FROM c  where c.pk='LessonRecord' and  c.code<>'LessonRecord-ydzt' ";
             List<LessonRecord> lessonRecords = new List<LessonRecord>();
-            await foreach (var item in _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).GetItemQueryIterator<LessonRecord>(queryText: sql,requestOptions:new QueryRequestOptions { }))
+            await foreach (var item in _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).GetItemQueryIterator<LessonRecord>(queryText: sql,requestOptions:new QueryRequestOptions {/* PartitionKey = new PartitionKey("LessonRecord-ydzt")*/ }))
             {
                 lessonRecords.Add(item);
             }