update

TEAMModelOS.SDK/Models/Service/StudentService.cs

@@ -896,7 +896,7 @@ namespace TEAMModelOS.SDK
                                     guardians.ForEach(async x => {
                                         GuardianStudent guardianStudent =  x.students.Find(s => s.id.Equals(stud.Key)  && s.code.Equals(schoolId));
                                         if (guardianStudent == null) {
-                                            x.students.Add(new GuardianStudent { type=2,id=stud.Key,code=schoolId,name=stud.Value.name });
+                                            x.students.Add(new GuardianStudent { relation=stud.Value.guardian, type=2,id=stud.Key,code=schoolId,name=stud.Value.name });
                                         }
                                        await cosmosContainer.ReplaceItemAsync(x, x.id, new PartitionKey(x.code));
                                     });
@@ -908,7 +908,7 @@ namespace TEAMModelOS.SDK
                                         pk= "Guardian",
                                         mobile=stud.Value.gPhone,
                                         name = stud.Value.gName,
-                                        students = new List<GuardianStudent> { new GuardianStudent { type = 2, id = stud.Key, code = schoolId, name = stud.Value.name } }
+                                        students = new List<GuardianStudent> { new GuardianStudent { relation=stud.Value.guardian,  type = 2, id = stud.Key, code = schoolId, name = stud.Value.name } }
                                     };
                                     await  cosmosContainer.CreateItemAsync(guardian,   new PartitionKey(guardian.code));
                                 }
@@ -1130,7 +1130,7 @@ namespace TEAMModelOS.SDK
                                 GuardianStudent guardianStudent = x.students.Find(s => s.id.Equals(studCreateInfo.id) && s.code.Equals(schoolId));
                                 if (guardianStudent == null)
                                 {
-                                    x.students.Add(new GuardianStudent { type = 2, id = studCreateInfo.id, code = schoolId, name = studCreateInfo.name });
+                                    x.students.Add(new GuardianStudent {relation=studentGuardian.relation, type = 2, id = studCreateInfo.id, code = schoolId, name = studCreateInfo.name });
                                 }
                                 await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Student).ReplaceItemAsync(x, x.id, new PartitionKey(x.code));
                             });
@@ -1144,7 +1144,7 @@ namespace TEAMModelOS.SDK
                                 pk = "Guardian",
                                 mobile = studentGuardian.mobile,
                                 name = studentGuardian.name,
-                                students = new List<GuardianStudent> { new GuardianStudent { type = 2, id = studCreateInfo.id, code = schoolId, name = studCreateInfo.name } }
+                                students = new List<GuardianStudent> { new GuardianStudent { relation=studentGuardian.relation, type = 2, id = studCreateInfo.id, code = schoolId, name = studCreateInfo.name } }
                             };
                             await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Student).CreateItemAsync(guardian, new PartitionKey(guardian.code));
                         }
@@ -2385,7 +2385,7 @@ namespace TEAMModelOS.SDK
                                                     GuardianStudent guardianStudent = x.students.Find(s => s.id.Equals(id) && s.code.Equals(schoolId));
                                                     if (guardianStudent == null)
                                                     {
-                                                        x.students.Add(new GuardianStudent { type = 2, id = id, code = schoolId, name = studentInfos[id].name });
+                                                        x.students.Add(new GuardianStudent { relation =gtudentGuardian.relation, type = 2, id = id, code = schoolId, name = studentInfos[id].name });
                                                     }
                                                     try { await cosmosContainer.ReplaceItemAsync(x, x.id, new PartitionKey(x.code)); } catch { }
                                                 });
@@ -2399,7 +2399,7 @@ namespace TEAMModelOS.SDK
                                                     pk = "Guardian",
                                                     mobile = gtudentGuardian.mobile,
                                                     name = gtudentGuardian.name,
-                                                    students = new List<GuardianStudent> { new GuardianStudent { type = 2, id = id, code = schoolId, name = studentInfos[id].name } }
+                                                    students = new List<GuardianStudent> { new GuardianStudent {relation=gtudentGuardian.relation, type = 2, id = id, code = schoolId, name = studentInfos[id].name } }
                                                 };
                                                 try { await cosmosContainer.CreateItemAsync(guardian, new PartitionKey(guardian.code)); } catch { }
                                             }

TEAMModelOS/Controllers/Client/AClassONEController.cs

@@ -160,7 +160,7 @@ namespace TEAMModelOS.Controllers
                                 if (studentGuardian != null)
                                 {
                                     guardianName = studentGuardian.name;
-                                    guardianStudents.Add(new GuardianStudent { type = 2, id = x.id, code = x.schoolId, name = x.name, picture = x.picture });
+                                    guardianStudents.Add(new GuardianStudent {relation=studentGuardian.relation, type = 2, id = x.id, code = x.schoolId, name = x.name, picture = x.picture });
                                 }
                             });
                             if (guardians.Any())
@@ -209,7 +209,7 @@ namespace TEAMModelOS.Controllers
                         foreach (var stu in stus)
                         {
                             HashSet<string> classIds = new HashSet<string>();
-                            string sqlStudent = $"select c.name ,c.periodId ,c.id ,c.schoolId, c.picture, c.classId, c.gender, c.year  from c where c.id in ({string.Join(",", stu.list.Select(s => $"'{s.id}'"))})";
+                            string sqlStudent = $"select c.name ,c.periodId ,c.id ,c.schoolId, c.picture, c.classId, c.gender, c.year,c.guardians  from c where c.id in ({string.Join(",", stu.list.Select(s => $"'{s.id}'"))})";
                             await foreach (var item in _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.Student).
                             GetItemQueryIterator<Student>(queryText: sqlStudent, requestOptions: new QueryRequestOptions { PartitionKey = new PartitionKey($"Base-{stu.Key}") }))
                             {