zhouj1203@hotmail.com преди 3 години
родител
ревизия
7ac5a47e34
променени са 2 файла, в които са добавени 5 реда и са изтрити 6 реда
  1. 1 2
      TEAMModelOS.SDK/Models/Service/LessonService.cs
  2. 4 4
      TEAMModelOS/Controllers/Analysis/ClassAnalysisController.cs

+ 1 - 2
TEAMModelOS.SDK/Models/Service/LessonService.cs

@@ -117,8 +117,7 @@ namespace TEAMModelOS.SDK.Models.Service
                     LessonCount count = new LessonCount
                     {
                         id = data.tmdid,
-                        code = code,
-                        year = year
+                        code = code
                     };
                     double[] da = new double[days];
                     List<double> list = new List<double>(da);

+ 4 - 4
TEAMModelOS/Controllers/Analysis/ClassAnalysisController.cs

@@ -339,8 +339,8 @@ namespace TEAMModelOS.Controllers.Analysis
             List<LessonCount> tcount = new();
             DenseMatrix dense = null;
             await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIterator<LessonCount>(
-                        queryText: $"select value(c) from c where c.year = {syear}",
-                        requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"LessonCount-{code}") }))
+                        queryText: $"select value(c) from c",
+                        requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"LessonCount-{code}-{syear}") }))
             {
                 scount.Add(item);
             }
@@ -349,8 +349,8 @@ namespace TEAMModelOS.Controllers.Analysis
             {
                 //跨年
                 await foreach (var item in client.GetContainer(Constant.TEAMModelOS, "Common").GetItemQueryIterator<LessonCount>(
-                            queryText: $"select value(c) from c where c.year = {tyear}",
-                            requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"LessonCount-{code}") }))
+                            queryText: $"select value(c) from c",
+                            requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"LessonCount-{code}-{tyear}") }))
                 {
                     tcount.Add(item);
                 }