CrazyIter_Bin 2 år sedan
förälder
incheckning
6087d5631d

+ 5 - 2
TEAMModelOS.SDK/Models/Service/StatisticsService.cs

@@ -1,5 +1,6 @@
 using Azure.Cosmos;
 using Azure.Messaging.ServiceBus;
+using DocumentFormat.OpenXml.Spreadsheet;
 using HTEXLib.COMM.Helpers;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
@@ -240,6 +241,7 @@ namespace TEAMModelOS.SDK
                         name = member.name,
                         picture = member.picture,
                         school = school,
+                        groupName=member.groupName,
                         update = new HashSet<string> { TeacherAbility, TeacherClass, OfflineRecord }
                     });
                 }
@@ -272,7 +274,7 @@ namespace TEAMModelOS.SDK
                     x.name = !string.IsNullOrWhiteSpace(x.name) ? x.name : mbm?.name;
                     x.nickname = mbm?.nickname;
                     x.picture = mbm?.picture;
-
+                    x.groupName = mbm?.groupName;
                 }
             });
             return (returnTrains, yxtrain, updateTeacherTrains);
@@ -327,6 +329,7 @@ namespace TEAMModelOS.SDK
                         name = member.name,
                         picture = member.picture,
                         school = school,
+                        groupName = member.groupName,
                         update = new HashSet<string> { TeacherAbility, TeacherClass, OfflineRecord }
                     });
                 }
@@ -356,7 +359,7 @@ namespace TEAMModelOS.SDK
                     x.name = !string.IsNullOrWhiteSpace(x.name) ? x.name : mbm?.name;
                     x.nickname = mbm?.nickname;
                     x.picture = mbm?.picture;
-                    
+                    x.groupName = mbm?.groupName;
                 }
             });
 

+ 2 - 0
TEAMModelOS/Controllers/Normal/AbilityStatisticsController.cs

@@ -283,6 +283,8 @@ namespace TEAMModelOS.Controllers
                         x.school,
                         x.id,
                         x.totalTime,
+                        x.groupName,
+                        x.picture,
                         currency = new {
                             x.currency.submitTime,
                             x.currency.exerciseAbility,