lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-04-05 17:37:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Synchronization code

Browse Source
This commit is contained in:
sunkaixuan 2023-11-02 21:58:55 +08:00
parent 20782a96ae
commit d8abcc1f55
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Src/Asp.NetCore2/SqlSugar/Json2Sql/JsonModels/SelectFieldModel.cs
View File

@ -7,7 +7,11 @@ namespace SqlSugar
{ {
public class SelectModel public class SelectModel
{ {
public object FiledName { get; set; } public object FieldName { get; set; }
[Obsolete("名字拼错使用FieldName")]
public object FiledName { get { return FieldName; } set { FieldName = value; } }
public string AsName { get; set; } public string AsName { get; set; }
public static List<SelectModel> Create(params SelectModel[] SelectModels) public static List<SelectModel> Create(params SelectModel[] SelectModels)

8
Src/Asp.NetCore2/SqlSugar/Json2Sql/JsonToModel/JsonToSelectModels.cs
View File

@ -22,7 +22,7 @@ namespace SqlSugar
} }
else if (IsString(item)) else if (IsString(item))
{ {
conditionalModels.Add(new SelectModel() { FiledName = item.ObjToString().ToCheckField(), AsName = item.ObjToString().Replace(".", "_") }); conditionalModels.Add(new SelectModel() { FieldName = item.ObjToString().ToCheckField(), AsName = item.ObjToString().Replace(".", "_") });
} }
else if (IsArraySingleItem(item)) else if (IsArraySingleItem(item))
{ {
@ -34,7 +34,7 @@ namespace SqlSugar
} }
conditionalModels.Add(new SelectModel() conditionalModels.Add(new SelectModel()
{ {
FiledName = fileName, FieldName = fileName,
AsName = asName AsName = asName
}); });
@ -49,7 +49,7 @@ namespace SqlSugar
} }
conditionalModels.Add(new SelectModel() conditionalModels.Add(new SelectModel()
{ {
FiledName = fileName, FieldName = fileName,
AsName = asName AsName = asName
}); });
@ -58,7 +58,7 @@ namespace SqlSugar
{ {
conditionalModels.Add(new SelectModel() conditionalModels.Add(new SelectModel()
{ {
FiledName = item.ObjToString().Trim(), FieldName = item.ObjToString().Trim(),
AsName = item.ObjToString().Trim() AsName = item.ObjToString().Trim()
}); });
} }

6
Src/Asp.NetCore2/SqlSugar/Json2Sql/ModelToSql/SelectModelToSql.cs
View File

@ -17,7 +17,7 @@ namespace SqlSugar
{ {
var orderByModel = item as SelectModel; var orderByModel = item as SelectModel;
orderByModel.AsName=GetAsName(orderByModel); orderByModel.AsName=GetAsName(orderByModel);
orderByModel.FiledName = GetSqlPart(orderByModel.FiledName, pars).ObjToString(); orderByModel.FieldName = GetSqlPart(orderByModel.FieldName, pars).ObjToString();
AppendFiledName(sql, orderByModel); AppendFiledName(sql, orderByModel);
} }
else else
@ -32,7 +32,7 @@ namespace SqlSugar
{ {
if (orderByModel.AsName.IsNullOrEmpty()) if (orderByModel.AsName.IsNullOrEmpty())
{ {
orderByModel.AsName = orderByModel.FiledName.ObjToString(); orderByModel.AsName = orderByModel.FieldName.ObjToString();
} }
if (orderByModel.AsName.StartsWith(UtilConstants.ReplaceKey)) if (orderByModel.AsName.StartsWith(UtilConstants.ReplaceKey))
{ {
@ -48,7 +48,7 @@ namespace SqlSugar
private void AppendFiledName(StringBuilder sql, SelectModel orderByModel) private void AppendFiledName(StringBuilder sql, SelectModel orderByModel)
{ {
sql.Append($" {orderByModel.FiledName} AS {orderByModel.AsName} ,"); sql.Append($" {orderByModel.FieldName} AS {orderByModel.AsName} ,");
} }
} }
} }

6
Src/Asp.NetCore2/SqlSugar/Json2Sql/Provider/Queryable/AppendSelect.cs
View File

@ -39,10 +39,10 @@ namespace SqlSugar
List<SelectModel> result = new List<SelectModel>(); List<SelectModel> result = new List<SelectModel>();
foreach (var item in obj) foreach (var item in obj)
{ {
if (item.FiledName is string) if (item.FieldName is string)
{ {
var tableName = GetTableName(item.FiledName + ""); var tableName = GetTableName(item.FieldName + "");
var columnName = GetColumnName(item.FiledName + ""); var columnName = GetColumnName(item.FieldName + "");
if (IsMyColums(tableName, columnName)) if (IsMyColums(tableName, columnName))
{ {
result.Add(item); result.Add(item);