|
@@ -42,6 +42,11 @@ namespace TEAMModelOS.SDK.Module.AzureCosmosDBV3
|
|
|
bool pageBool = false;
|
|
|
GetPageNum(dict, ref offsetNum, ref limitNum, ref pageBool);
|
|
|
|
|
|
+ if (dict.TryGetValue("OrderBy", out object GroupBy))
|
|
|
+ {
|
|
|
+ dict.Remove("OrderBy");
|
|
|
+ };
|
|
|
+
|
|
|
//处理顺序
|
|
|
Stack<KeyValuePair<string, object>> stack = new Stack<KeyValuePair<string, object>>();
|
|
|
|
|
@@ -168,12 +173,19 @@ namespace TEAMModelOS.SDK.Module.AzureCosmosDBV3
|
|
|
}
|
|
|
logicOperNum += 1;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
sql.Append(" where 1=1 ").Append(WhereString);
|
|
|
+
|
|
|
+ if (GroupBy != null)
|
|
|
+ {
|
|
|
+ sql.Append(" Order By c." + GroupBy.ToString());
|
|
|
+ }
|
|
|
if (pageBool)
|
|
|
{
|
|
|
sql.Append(" OFFSET " + offsetNum + " LIMIT " + limitNum);
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
ReplaceKeyWords(ref sql);
|
|
|
parmeters = GetParmeter(dict, parmeters);
|
|
|
CosmosDbQuery cosmosDbQuery = new CosmosDbQuery
|
|
@@ -256,7 +268,7 @@ namespace TEAMModelOS.SDK.Module.AzureCosmosDBV3
|
|
|
foreach (JValue obja in array)
|
|
|
{
|
|
|
sql.Append(" @" + key1 + aa + " ,");
|
|
|
-
|
|
|
+
|
|
|
aa++;
|
|
|
}
|
|
|
string sqls = sql.ToString().Substring(0, sql.Length - 1);
|
|
@@ -302,7 +314,7 @@ namespace TEAMModelOS.SDK.Module.AzureCosmosDBV3
|
|
|
TypeCode typeCode = Type.GetTypeCode(s);
|
|
|
if (compareOperNum == 4) keyListValueList = false;
|
|
|
return logicOper + key + compareOper + " @" + key1 + " ";
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -329,7 +341,7 @@ namespace TEAMModelOS.SDK.Module.AzureCosmosDBV3
|
|
|
{
|
|
|
s.Append("ToString( " + key + " )," + " \'@" + key1 + aa + "\' ) = " + compareOperBool + " ");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
aa++;
|
|
|
}
|
|
|
}
|