CrazyIter_Bin 3 tahun lalu
induk
melakukan
2b8611bd5e

+ 5 - 0
TEAMModelOS.SDK/Models/Cosmos/Normal/AreaSetting.cs

@@ -34,11 +34,16 @@ namespace TEAMModelOS.SDK.Models
         /// 学时换算(多少分钟换算一个学时)
         /// 学时换算(多少分钟换算一个学时)
         /// </summary>
         /// </summary>
         public int lessonMinutes { get; set; } = 45;
         public int lessonMinutes { get; set; } = 45;
+
         /// <summary>
         /// <summary>
         /// 限制分钟数
         /// 限制分钟数
         /// </summary>
         /// </summary>
         public int limitMinutes { get; set; } = -1;
         public int limitMinutes { get; set; } = -1;
         /// <summary>
         /// <summary>
+        /// 限制修满多少能力点个数
+        /// </summary>
+        public int limitAbility { get; set; } = 3;
+        /// <summary>
         /// 文档类型
         /// 文档类型
         /// </summary>
         /// </summary>
         public List<string> doc { get; set; } = new List<string>();
         public List<string> doc { get; set; } = new List<string>();

+ 6 - 8
TEAMModelOS.SDK/Models/Service/StatisticsService.cs

@@ -69,7 +69,7 @@ namespace TEAMModelOS.SDK
                     });
                     });
                     task.Add(client.GetContainer(Constant.TEAMModelOS, "Teacher").ReplaceItemAsync<TeacherTrain>(x, x.id, new PartitionKey($"TeacherTrain-{change.school}")));
                     task.Add(client.GetContainer(Constant.TEAMModelOS, "Teacher").ReplaceItemAsync<TeacherTrain>(x, x.id, new PartitionKey($"TeacherTrain-{change.school}")));
                 });
                 });
-                await task.TaskPage(50);
+                await task.TaskPage(5);
                 var unchange = change.tmdids.Except(teacherTrains.Select(x => x.id));
                 var unchange = change.tmdids.Except(teacherTrains.Select(x => x.id));
                 if (unchange != null)
                 if (unchange != null)
                 {
                 {
@@ -90,7 +90,7 @@ namespace TEAMModelOS.SDK
                         }); 
                         }); 
                         task.Add(client.GetContainer(Constant.TEAMModelOS, "Teacher").CreateItemAsync<TeacherTrain>(teacherTrain, new PartitionKey($"TeacherTrain-{change.school}")));
                         task.Add(client.GetContainer(Constant.TEAMModelOS, "Teacher").CreateItemAsync<TeacherTrain>(teacherTrain, new PartitionKey($"TeacherTrain-{change.school}")));
                     });
                     });
-                    await task.TaskPage(100);
+                    await task.TaskPage(5);
                 }
                 }
             }
             }
 
 
@@ -114,7 +114,7 @@ namespace TEAMModelOS.SDK
                     });
                     });
                     task.Add(client.GetContainer(Constant.TEAMModelOS, "Teacher").ReplaceItemAsync<TeacherTrain>(x, x.id, new PartitionKey($"TeacherTrain-{list.school}")));
                     task.Add(client.GetContainer(Constant.TEAMModelOS, "Teacher").ReplaceItemAsync<TeacherTrain>(x, x.id, new PartitionKey($"TeacherTrain-{list.school}")));
                 });
                 });
-                await task.TaskPage(50);
+                await task.TaskPage(5);
                 var unchange = list.tmdids.Except(teacherTrains.Select(x => x.id));
                 var unchange = list.tmdids.Except(teacherTrains.Select(x => x.id));
                 if (unchange != null)
                 if (unchange != null)
                 {
                 {
@@ -136,7 +136,7 @@ namespace TEAMModelOS.SDK
                        
                        
                         task.Add(client.GetContainer(Constant.TEAMModelOS, "Teacher").UpsertItemAsync<TeacherTrain>(teacherTrain, new PartitionKey($"TeacherTrain-{list.school}")));
                         task.Add(client.GetContainer(Constant.TEAMModelOS, "Teacher").UpsertItemAsync<TeacherTrain>(teacherTrain, new PartitionKey($"TeacherTrain-{list.school}")));
                     });
                     });
-                    await task.TaskPage(100);
+                    await task.TaskPage(1);
                 }
                 }
             }
             }
         }
         }
@@ -272,7 +272,7 @@ namespace TEAMModelOS.SDK
             {
             {
                 teachers.Add(StatisticsTeacher(train, setting, area, client, studies));  //yield return await  StatisticsTeacher(  train,   setting,   area,   client);
                 teachers.Add(StatisticsTeacher(train, setting, area, client, studies));  //yield return await  StatisticsTeacher(  train,   setting,   area,   client);
             }
             }
-            int pagesize = 100;
+            int pagesize = 50;
             if (teachers.Count <= pagesize)
             if (teachers.Count <= pagesize)
             {
             {
                 await Task.WhenAll(teachers);
                 await Task.WhenAll(teachers);
@@ -301,7 +301,7 @@ namespace TEAMModelOS.SDK
                 {
                 {
                     teachers.Add(DoProperty(train.update, property, setting, area, client, train, studies));
                     teachers.Add(DoProperty(train.update, property, setting, area, client, train, studies));
                 }
                 }
-                int pagesize = 100;
+                int pagesize = 50;
                 if (teachers.Count <= pagesize)
                 if (teachers.Count <= pagesize)
                 {
                 {
                     await Task.WhenAll(teachers);
                     await Task.WhenAll(teachers);
@@ -813,8 +813,6 @@ namespace TEAMModelOS.SDK
                 if (ability != null)
                 if (ability != null)
                 {
                 {
 
 
-
-
                     if (ability != null)
                     if (ability != null)
                     {
                     {
                         currencyInt = item.from == 0 ? ability.currency : 1;
                         currencyInt = item.from == 0 ? ability.currency : 1;