|
@@ -22,6 +22,7 @@ using TEAMModelOS.SDK.Extension;
|
|
|
using TEAMModelOS.SDK.Models;
|
|
|
using TEAMModelOS.SDK.Models.Cosmos.BI;
|
|
|
using Top.Api;
|
|
|
+using static TEAMModelBI.Controllers.BITest.TestController;
|
|
|
|
|
|
namespace TEAMModelBI.Controllers.BINormal
|
|
|
{
|
|
@@ -106,6 +107,12 @@ namespace TEAMModelBI.Controllers.BINormal
|
|
|
joinAreaSchool.areas = obj.GetProperty("areas").ToObject<List<SchoolArea>>();
|
|
|
}
|
|
|
catch { }
|
|
|
+
|
|
|
+ if (!string.IsNullOrEmpty($"{joinAreaSchool.id}"))
|
|
|
+ {
|
|
|
+ joinAreaSchool.assists = await CommonFind.FindSchoolRoles(cosmosClient, joinAreaSchool.id, "assist");
|
|
|
+ }
|
|
|
+
|
|
|
joinAreaSchools.Add(joinAreaSchool);
|
|
|
}
|
|
|
}
|
|
@@ -604,6 +611,7 @@ namespace TEAMModelBI.Controllers.BINormal
|
|
|
public string city { get; set; }
|
|
|
public string dist { get; set; }
|
|
|
public List<SchoolArea> areas { get; set; } = new List<SchoolArea>();
|
|
|
+ public List<SchoolTeacherRoles> assists { get; set; } = new List<SchoolTeacherRoles>();
|
|
|
}
|
|
|
|
|
|
}
|