CrazyIter_Bin 2 rokov pred
rodič
commit
448619c0e7

+ 2 - 10
TEAMModelOS.SDK/Models/Service/StudentService.cs

@@ -1835,7 +1835,7 @@ namespace TEAMModelOS.SDK
         /// <param name="students"></param>
         /// <returns></returns>
         public static async Task<(List<object> studs, Dictionary<string, List<string>> classDuplNos, List<string> nonexistentIds, List<string> errorIds, Dictionary<string, List<string>> errorNos, List<string> errorClassId)>
-            updateStudents(AzureCosmosFactory _azureCosmos, DingDing _dingDing, Option _option, string schoolId, JsonElement.ArrayEnumerator students,bool cleanImei)
+            updateStudents(AzureCosmosFactory _azureCosmos, DingDing _dingDing, Option _option, string schoolId, JsonElement.ArrayEnumerator students)
         {
             try
             {
@@ -2227,17 +2227,9 @@ namespace TEAMModelOS.SDK
                                     writer.WriteEndObject();
                                     writer.Flush();
                                     //编辑是是否要明确清除电子学生证。
-                                    if (cleanImei)
-                                    {
-                                        await upsertImei(id, studentInfos[id].imei, schoolId, "clean", _azureCosmos
+                                    await upsertImei(id, studentInfos[id].imei, schoolId, "clean", _azureCosmos
                                                          .GetCosmosClient()
                                                          .GetContainer(Constant.TEAMModelOS, "Student"));
-                                    }
-                                    else {
-                                        await upsertImei(id, studentInfos[id].imei, schoolId, "keep", _azureCosmos
-                                                       .GetCosmosClient()
-                                                       .GetContainer(Constant.TEAMModelOS, "Student"));
-                                    }
                                     try
                                     {
                                         var ret = await cosmosContainer.ReplaceItemStreamAsync(memoryStream, id, new PartitionKey($"Base-{schoolId}"));

+ 1 - 1
TEAMModelOS/Controllers/OpenApi/OpenSchool/ScGroupListController.cs

@@ -134,7 +134,7 @@ namespace TEAMModelOS.Controllers
                     List<Student> webStudents = json.GetProperty("students").ToObject<List<Student>>();
                     webStudents.ForEach(x => x.periodId = $"{_periodId}");
                     List<Student> preStudents = await StudentService.GeStudentData(_azureCosmos, school, webStudents?.Select(x => x.id));
-                    var retUpdate = await StudentService.updateStudents(_azureCosmos, _dingDing, _option, school, json.GetProperty("students").EnumerateArray(),false);
+                    var retUpdate = await StudentService.updateStudents(_azureCosmos, _dingDing, _option, school, json.GetProperty("students").EnumerateArray());
                     await StudentService.CheckStudent(_serviceBus, _configuration, _azureCosmos, school, webStudents, preStudents);
                     return Ok(new { code = school, students = retUpdate.studs, retUpdate.classDuplNos, retUpdate.nonexistentIds, retUpdate.errorNos, retUpdate.errorClassId });
                 }

+ 7 - 7
TEAMModelOS/Controllers/Student/StudentController.cs

@@ -175,15 +175,15 @@ namespace TEAMModelOS.Controllers
                     case "update":
                         //更新學生資料,批量密碼重置,基本資訊更新(姓名、教室ID、性別、學年及座號)
                         webStudents = request.GetProperty("students").ToObject<List<Student>>();
-                        var cleanImei  = false;
-                         
-                        if (request.GetProperty("cleanImei").ValueKind.Equals(JsonValueKind.True))
-                        {
-                            cleanImei = true;
-                        }
+                        //var cleanImei  = false;
+                        // request.TryGetProperty("cleanImei",out JsonElement _cleanImei);
+                        //if (_cleanImei.ValueKind.Equals(JsonValueKind.True))
+                        //{
+                        //    cleanImei = true;
+                        //}
                         
                         preStudents = await StudentService.GeStudentData(_azureCosmos, schoolId.GetString(), webStudents?.Select(x => x.id));
-                        var retUpdate = await StudentService.updateStudents(_azureCosmos, _dingDing, _option, schoolId.GetString(), request.GetProperty("students").EnumerateArray(), cleanImei);
+                        var retUpdate = await StudentService.updateStudents(_azureCosmos, _dingDing, _option, schoolId.GetString(), request.GetProperty("students").EnumerateArray());
                         await StudentService.CheckStudent(_serviceBus, _configuration, _azureCosmos, schoolId.GetString(), webStudents, preStudents);
                         return this.Ok(new { code = $"Base-{schoolId.GetString()}", students = retUpdate.studs, retUpdate.classDuplNos, retUpdate.nonexistentIds, retUpdate.errorNos, retUpdate.errorClassId });
                     case "delete":