CrazyIter_Bin 1 年之前
父节点
当前提交
834aaed499

+ 2 - 2
TEAMModelOS.SDK/Models/Cosmos/Common/Activity.cs

@@ -199,7 +199,7 @@ namespace TEAMModelOS.SDK.Models
         /// 活动id
         /// </summary>
         public string activityId { get; set; }
-        public string schoolNmae { get; set; }
+        public string schoolName { get; set; }
         public List<InviteTeachers> inviteTeachers { get; set; } = new List<InviteTeachers>();
     }
 
@@ -556,7 +556,7 @@ namespace TEAMModelOS.SDK.Models
     public class ActivityExpert : CosmosEntity
     {
         /// <summary>
-        /// 活动id
+        ///id 活动id
         /// </summary>
         public ActivityExpert() {
             pk="ActivityExpert";

+ 8 - 2
TEAMModelOS/Controllers/Common/ActivityController.cs

@@ -885,7 +885,7 @@ namespace TEAMModelOS.Controllers
                                             activityTeacher = JsonDocument.Parse(activityTeacherResponse.Content).RootElement.ToObject<ActivityTeacher>();
                                         }
                                         if (activityTeacher==null) {
-                                            activityTeacher= new ActivityTeacher() { activityId=_activityId.GetString(), schoolNmae= confirmedSchool.name, id=school, code=$"ActivityTeacher-{_activityId}", pk="ActivityTeacher" };
+                                            activityTeacher= new ActivityTeacher() { activityId=_activityId.GetString(), schoolName= activity.scope.Equals("school")  && confirmedSchool== null? activity.ownerName : confirmedSchool.name, id=school, code=$"ActivityTeacher-{_activityId}", pk="ActivityTeacher" };
                                         }
                                         if (_invite.ValueKind.Equals(JsonValueKind.Array)) {
                                             List<InviteTeachers> inviteTeachers = _invite.ToObject<List<InviteTeachers>>();
@@ -1422,6 +1422,13 @@ namespace TEAMModelOS.Controllers
                             }
                             return Ok(new { activityExpert, code = 200 });
                         }
+                    //统计活动数据
+                    case bool when $"{grant_type}".Equals("", StringComparison.OrdinalIgnoreCase):
+                        {
+                            break;
+                        }
+
+
                 }
             } catch (Exception ex)
             {
@@ -1783,7 +1790,6 @@ namespace TEAMModelOS.Controllers
 
                                 break;
                             }
-
                     }
                 }
             }