Merge branch 'develop' of http://163.228.141.122:3000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/Controllers/Third/XunFeiJYY/XunFeilJYYController.cs

@@ -115,34 +115,34 @@ namespace TEAMModelOS.Controllers.Third.XunFeiJYY
                 List<XunFeiJYYBindDto> dtos = new List<XunFeiJYYBindDto>();
                 dtos.Add(new XunFeiJYYBindDto {
                     id="fbc284072a40da84352496274afc3bc55db54e6686cf3af22a9f0a295239691707dc038c5d090450c46bdea890254258b8a118406664bdaf",
-                    code="",
+                    code="habook",
                     key="school",
                     name="厦大附属翔安实验学校"
                 }); 
                 dtos.Add(new XunFeiJYYBindDto
                 {
                     id="03",
-                    code="",
+                    code="50fdecdb-6cbd-4c9a-8dc2-a627f4d6b312",
                     key="period",
                     name="小学"
                 }); dtos.Add(new XunFeiJYYBindDto
                 {
                     id="04",
-                    code="",
+                    code="a098e3f2-e295-a385-bfe5-1cfc91a64c24",
                     key="period",
                     name="初中"
                 });
                 dtos.Add(new XunFeiJYYBindDto
                 {
                     id="05",
-                    code="",
+                    code="36725f35-03f8-ae37-0729-5aa8a52eb1d8",
                     key="period",
                     name="高中"
                 });
                 var table = _azureStorage.GetCloudTableClient().GetTableReference("ScYxpt");
                 List<Class> classes = new List<Class>();
                 var schoolDto = dtos.FindAll(x => x.key.Equals("school")).First();
-                var dbclassrs = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).GetList<Class>($"selelct value c from c ", $"Class-{schoolDto.code}");
+                var dbclassrs = await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, Constant.School).GetList<Class>($"select value c from c ", $"Class-{schoolDto.code}");
                 if (dbclassrs.list.IsNotEmpty()) 
                 {
                     classes.AddRange(dbclassrs.list);
@@ -171,6 +171,7 @@ namespace TEAMModelOS.Controllers.Third.XunFeiJYY
                         saveClazz.tmdPeriodId=periodDto.code;
                         saveClazz.tmdClassId=tmdClassId;
                         saveClazz.PartitionKey="XunFeiJYYClass";
+                        saveClazz.RowKey=clazz.id;
                         dbExists = false;
                     }
                     if (!dbExists) 
@@ -220,14 +221,14 @@ namespace TEAMModelOS.Controllers.Third.XunFeiJYY
                             }
                             else
                             {
-                                saveStudent.tmdStudentId=$"{tmdClassYear}{clazz.phaseCode}{tmdClassNO.PadLeft(2, '0')}{student.classNo.PadLeft(2, '0')}";
+                                saveStudent.tmdStudentId=$"{tmdClassYear}{clazz.phaseCode}{tmdClassNO.PadLeft(2, '0')}{student.classNo.PadLeft(3, '0')}";
                                 saveStudent.hashNo=  $"{MurmurHash3.Hash32(student.id)}";
                                 saveStudent.RowKey = student.id;
                                 saveStudent.PartitionKey="XunFeiJYYStudent";
                                 saveStudent.tmdClassId=saveClazz.tmdClassId;
                                 dbExists = false;
                             }
-                            if (dbExists)
+                            if (!dbExists)
                             {
                                 var salt = Utils.CreatSaltString(8);
                                 var pw = Utils.HashedPassword(saveStudent.tmdStudentId, salt);