Merge branch 'develop' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS.Model/BaseInfo/Models/ClassRoom.cs

@@ -10,12 +10,12 @@ namespace TEAMModelOS.Model.BaseInfo.Models
     {
         [JsonProperty(PropertyName = "id")]
         public string Id { get; set; }
+        [PartitionKey]
         public string Code { get; set; }
         public string Name { get; set; }
         public string HeadMaster { get; set; }
         public string Period { get; set; }
-        public string Grade { get; set; }
-        [PartitionKey]
+        public string Grade { get; set; }        
         public string HiTeach { get; set; }
         public int StuNum { get; set; }
         public string ClassroomType { get; set; }

TEAMModelOS.Service/Core/Implements/ClassRoomService.cs

@@ -28,5 +28,10 @@ namespace TEAMModelOS.Service.Core.Implements
             return classRoom;
             //throw new NotImplementedException();
         }
+        public async Task<List<Classroom>> FindClassInfo(Dictionary<string, object> code)
+        {
+
+            return await _cosmosrepository.FindByparams<Classroom>(code);
+        }
     }
 }

TEAMModelOS.Service/Core/Interfaces/IClassRoomService.cs

@@ -10,5 +10,6 @@ namespace TEAMModelOS.Service.Core.Interfaces
     {
         Task<Classroom> SaveToCosmosDB(Classroom classRoom);
         Task<Classroom> UpdateRoom(Classroom classRoom);
+        Task<List<Classroom>> FindClassInfo(Dictionary<string, object> code);
     }
 }

TEAMModelOS/Controllers/Core/ClassRoomController.cs

@@ -36,5 +36,14 @@ namespace TEAMModelOS.Controllers.Core
             }
             return builder.Data(data).build();
         }
+
+        [HttpPost("FindClassInfo")]
+        public async Task<BaseJosnRPCResponse> GetSchoolInfo(JosnRPCRequest<Dictionary<string, object>> request)
+        {
+            JsonRPCResponseBuilder builder = JsonRPCResponseBuilder.custom();
+            List<Classroom> sc = await classRoomService.FindClassInfo(request.@params);
+            //sc.First
+            return builder.Data(sc).build();
+        }
     }
 }