1.处理接口get-nojoinsc

2.处理学区统计查询条件

TEAMModelBI/Controllers/BISchool/SchoolController.cs

@@ -126,12 +126,12 @@ namespace TEAMModelBI.Controllers.BISchool
                                 period = obj.GetProperty("period").ToObject<List<Period>>().Select(x => x.name).ToList(),
                                 province = obj.GetProperty("province").GetString(),
                                 city = obj.GetProperty("city").GetString(),
-                                dist = obj.GetProperty("dist").GetString(),
-                                areaId = obj.GetProperty("areaId").GetString(),
-                                standard = obj.GetProperty("standard").GetString()
                             };
                             try
                             {
+                                notAreaSchool.dist = obj.GetProperty("dist").GetString();
+                                notAreaSchool.areaId = obj.GetProperty("areaId").GetString();
+                                notAreaSchool.standard = obj.GetProperty("standard").GetString();
                                 notAreaSchool.areas = obj.GetProperty("manyAreas").ToObject<List<SchoolArea>>();
                             }
                             catch { }
@@ -201,11 +201,10 @@ namespace TEAMModelBI.Controllers.BISchool
                 if (jsonElement.TryGetProperty("contToken", out JsonElement ContToken))
                     pageToken = ContToken.GetString();
 
-
-                StringBuilder sqltxt = new($"SELECT c.id,c.name,c.schoolCode,c.province,c.city,c.dist,c.picture,c.period,c.areaId,c.standard,c.manyAreas FROM c WHERE c.pk='School' and (c.areaId = '' or c.areaId = null or IS_DEFINED(c.areaId) = false)");
-
+                //StringBuilder sqltxt = new($"SELECT c.id,c.name,c.schoolCode,c.province,c.city,c.dist,c.picture,c.period,c.areaId,c.standard,c.manyAreas FROM c WHERE c.pk='School' and (c.areaId = '' or c.areaId = null or IS_DEFINED(c.areaId) = false)");
+                string sqltxt = $"SELECT value(c) FROM c WHERE c.pk='School' and (c.areaId = '' or c.areaId = null or IS_DEFINED(c.areaId) = false)";
                 List<NotAreaSchool> notAreaSchools = new();
-                await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIterator(queryText: sqltxt.ToString(), continuationToken: pageToken, requestOptions: new QueryRequestOptions() { MaxItemCount = pageSize, PartitionKey = new PartitionKey("Base") }))
+                await foreach (var item in cosmosClient.GetContainer(Constant.TEAMModelOS, "School").GetItemQueryStreamIterator(queryText: sqltxt, continuationToken: pageToken, requestOptions: new QueryRequestOptions() { MaxItemCount = pageSize, PartitionKey = new PartitionKey("Base") }))
                 {
                     using var json = await JsonDocument.ParseAsync(item.ContentStream);
                     if (json.RootElement.TryGetProperty("_count", out JsonElement count) && count.GetUInt16() > 0)
@@ -221,12 +220,13 @@ namespace TEAMModelBI.Controllers.BISchool
                                 period = obj.GetProperty("period").ToObject<List<Period>>().Select(x => x.name).ToList(),
                                 province = obj.GetProperty("province").GetString(),
                                 city = obj.GetProperty("city").GetString(),
-                                dist = obj.GetProperty("dist").GetString(),
-                                areaId = obj.GetProperty("areaId").GetString(),
-                                standard = obj.GetProperty("standard").GetString()
+                                dist = obj.GetProperty("dist").GetString()
                             };
                             try
                             {
+                                notAreaSchool.dist = obj.GetProperty("dist").GetString();
+                                notAreaSchool.areaId = obj.GetProperty("areaId").GetString();
+                                notAreaSchool.standard = obj.GetProperty("standard").GetString();
                                 notAreaSchool.areas = obj.GetProperty("manyAreas").ToObject<List<SchoolArea>>();
                             }
                             catch { }
@@ -2538,9 +2538,9 @@ namespace TEAMModelBI.Controllers.BISchool
             public List<string> period { get; set; }
             public string province { get; set; }
             public string city { get; set; }
-            public string dist { get; set; }
-            public string areaId { get; set; }
-            public string standard { get; set; }
+            public string dist { get; set; } = "";
+            public string areaId { get; set; } = "";
+            public string standard { get; set; } = "";
             public List<SchoolArea> areas { get; set; } = new List<SchoolArea>();
         }
 

TEAMModelBI/Controllers/Census/ActivitySticsController.cs

@@ -183,7 +183,7 @@ namespace TEAMModelBI.Controllers.Census
                 }
             }
             else            
-                scSql = "select value(c.id) from c where c.areaId = null or c.areaId = ''";
+                scSql = "select value(c.id) from c where (c.areaId = null or c.areaId = '' or IS_DEFINED(c.areaId) = false)";
             
             if (setting == null)
             {