update

TEAMModelOS.SDK/Models/Cosmos/Common/Activity.cs

@@ -534,6 +534,9 @@ namespace TEAMModelOS.SDK.Models
 
     public class ExpertPeriodSubjectDto
     {
+        public string expertTmdname { get; set; }
+        public string expertPicture { get; set; }
+        public string expertName { get; set; }
         public string expertId { get; set; }
         public IEnumerable<string> periodSubjects { get; set; }= new List<string>();
     }
@@ -683,6 +686,10 @@ namespace TEAMModelOS.SDK.Models
     /// </summary>
     public class ActivityExpertTask : CosmosEntity
     {
+        public  string name { get; set; }
+        public string picture { get; set; }
+        public string tmdname { get; set; }
+
         //id  专家id ,
         //code  ActivityExpertTask-活动id
         /// <summary>
@@ -693,6 +700,9 @@ namespace TEAMModelOS.SDK.Models
     [Serializable]
     public class ExpertContestTaskDto : ExpertContestTask
     {
+        public string expertTmdname  { get; set; }
+        public string expertPicture { get; set; }
+        public string expertName { get; set; }
         public string expertId { get; set; }
         public string periodSubjectKey { get; set; }
         /// <summary>

TEAMModelOS.SDK/Models/Service/Common/ActivityService.cs

@@ -345,7 +345,10 @@ namespace TEAMModelOS.SDK
                 {
                     worksDB.AddRange(item.contestTasks.Select(z =>
                     new ExpertContestTaskDto
-                    {
+                    {   
+                        expertName=item.name ,
+                        expertPicture=item.picture,
+                        expertTmdname=item.tmdname,
                         expertId = item.id,
                         available = 1,
                         uploadId = z.uploadId,
@@ -637,6 +640,9 @@ namespace TEAMModelOS.SDK
                         var selectedExpert = availableExperts[random.Next(availableExperts.Count)];
                         var newWork=  work.DeepCopy<ExpertContestTaskDto>();
                         newWork.expertId = selectedExpert.expertId;
+                        newWork.expertName = selectedExpert.expertName;
+                        newWork.expertPicture = selectedExpert.expertPicture;
+                        newWork.expertTmdname = selectedExpert.expertTmdname;
                         newWork.available = 1;
                         newWork.turn = i + 1;
                         assignmentsAdd.Add(newWork);

TEAMModelOS/Controllers/Common/ActivityController.cs

@@ -1816,7 +1816,7 @@ namespace TEAMModelOS.Controllers
                                             ActivityExpert activityExpert = JsonDocument.Parse(responseActivityExpert.Content).RootElement.ToObject<ActivityExpert>();
 
                                             IEnumerable<ExpertPeriodSubjectDto> experts = activityExpert.experts.Where(z=>!string.IsNullOrWhiteSpace(z.id))//处理
-                                                .Select(z => new ExpertPeriodSubjectDto { expertId = z.id, periodSubjects = z.subjects.Select(v => $"{v.period}-{v.subject}") });
+                                                .Select(z => new ExpertPeriodSubjectDto { expertId = z.id ,expertName=z.iname, expertPicture=z.picture,expertTmdname=z.name, periodSubjects = z.subjects.Select(v => $"{v.period}-{v.subject}") });
                                             HashSet<string> periodSubjectKey = new HashSet<string>();
                                             List<dynamic> distributeInvalid = new List<dynamic>();
                                             string allocationTaskKey = $"Contest:Allocation:{_activityId}";
@@ -2028,6 +2028,9 @@ namespace TEAMModelOS.Controllers
                                             id = contestTask.expertId,
                                             code = $"ActivityExpertTask-{_activityId}",
                                             pk = "ActivityExpertTask",
+                                            picture=contestTask.expertPicture,
+                                            name=contestTask.expertName,
+                                            tmdname=contestTask.expertTmdname,
                                             contestTasks = new List<ExpertContestTask> { expertContestTask }
                                         };
                                         expertTasksChange.Add(activityExpertTask);