CrazyIter_Bin 2 anni fa
parent
commit
b8550ff287
1 ha cambiato i file con 21 aggiunte e 17 eliminazioni
  1. 21 17
      TEAMModelOS.SDK/Models/Service/StudentService.cs

+ 21 - 17
TEAMModelOS.SDK/Models/Service/StudentService.cs

@@ -1402,10 +1402,10 @@ namespace TEAMModelOS.SDK
             {
                 //TODO : 進階查詢選項調整、部分地方可用並行處理
                 //以學校學生角度去抓資料
-                Dictionary<string, List<(string id, string name, string picture, int year, string no, string periodId, string irs,string imei,List<StudentGuardian> guardians)>> dicClassStuds =
-                    new Dictionary<string, List<(string id, string name, string picture, int year, string no, string periodId, string irs, string imei, List<StudentGuardian> guardians)>>();
-                List<(string id, string name, string picture, int year, string no, string periodId, string irs, string imei, List<StudentGuardian> guardians)> notJoinClassStuds = 
-                    new List<(string id, string name, string picture, int year, string no, string periodId, string irs, string imei, List<StudentGuardian> guardians)>();
+                Dictionary<string, List<(string id, string name, string picture, int year, string no, string periodId, string irs,string imei,string gender, List<StudentGuardian> guardians)>> dicClassStuds =
+                    new Dictionary<string, List<(string id, string name, string picture, int year, string no, string periodId, string irs, string imei, string gender, List<StudentGuardian> guardians)>>();
+                List<(string id, string name, string picture, int year, string no, string periodId, string irs, string imei, string gender, List<StudentGuardian> guardians)> notJoinClassStuds = 
+                    new List<(string id, string name, string picture, int year, string no, string periodId, string irs, string imei, string gender, List<StudentGuardian> guardians)>();
 
 
                 List<Imei> imeis= new List<Imei>();
@@ -1463,6 +1463,7 @@ namespace TEAMModelOS.SDK
                                             acc.TryGetProperty("periodId", out JsonElement _periodId) && _periodId.ValueKind.Equals(JsonValueKind.String) ? _periodId.GetString() : null,
                                             $"{irs}",
                                             imeiObj?.id,//imei
+                                            acc.TryGetProperty("gender", out JsonElement _gender) && _gender.ValueKind.Equals(JsonValueKind.String) ? _gender.GetString() : null,
                                             guardians
                                         )
                                     );
@@ -1480,6 +1481,7 @@ namespace TEAMModelOS.SDK
                                                 acc.GetProperty("no").GetString(), acc.TryGetProperty("periodId", out JsonElement _periodId) && _periodId.ValueKind.Equals(JsonValueKind.String) ? _periodId.GetString() : null,
                                                 $"{irs}",
                                                 imeiObj?.id,//imei
+                                                acc.TryGetProperty("gender", out JsonElement _gender) && _gender.ValueKind.Equals(JsonValueKind.String) ? _gender.GetString() : null,
                                                 guardians
                                             )
                                         );
@@ -1487,18 +1489,19 @@ namespace TEAMModelOS.SDK
                                 else
                                 {
                                     dicClassStuds.Add(classId,
-                                            new List<(string id, string name, string picture, int year, string no, string periodId, string irs,string imei, List<StudentGuardian> guardians)>()
+                                            new List<(string id, string name, string picture, int year, string no, string periodId, string irs,string imei,string gender, List<StudentGuardian> guardians)>()
                                             {
-                                            (
-                                                acc.GetProperty("id").GetString(),
-                                                acc.GetProperty("name").GetString(),
-                                                acc.GetProperty("picture").GetString(),
-                                                acc.GetProperty("year").GetInt32(),
-                                                acc.GetProperty("no").GetString(),  acc.TryGetProperty("periodId",out JsonElement _periodId)&&  _periodId.ValueKind.Equals(JsonValueKind.String) ? _periodId.GetString() : null,
-                                                $"{irs}"  ,
-                                                imeiObj?.id,//imei
-                                                guardians
-                                            )
+                                                (
+                                                    acc.GetProperty("id").GetString(),
+                                                    acc.GetProperty("name").GetString(),
+                                                    acc.GetProperty("picture").GetString(),
+                                                    acc.GetProperty("year").GetInt32(),
+                                                    acc.GetProperty("no").GetString(),  acc.TryGetProperty("periodId",out JsonElement _periodId)&&  _periodId.ValueKind.Equals(JsonValueKind.String) ? _periodId.GetString() : null,
+                                                    $"{irs}"  ,
+                                                    imeiObj?.id,//imei
+                                                    acc.TryGetProperty("gender", out JsonElement _gender) && _gender.ValueKind.Equals(JsonValueKind.String) ? _gender.GetString() : null,
+                                                    guardians
+                                                )
                                             }
                                         );
                                 }
@@ -1549,8 +1552,8 @@ namespace TEAMModelOS.SDK
                                          classYear,
                                          irs = o.irs,
                                          imei=o.imei,
-                                         guardians=o.guardians,
-
+                                         gender = o.gender,
+                                         guardians =o.guardians,
                                      });
                     ret.AddRange(tmp);
                 }
@@ -1572,6 +1575,7 @@ namespace TEAMModelOS.SDK
                         classYear = -1,
                         irs = o.irs,
                         imei = o.imei,
+                        gender = o.gender,
                         guardians =o.guardians,
                     }));
                 return ret;