diff --git a/Src/Asp.Net/SqlServerTest/Demo/Demo1_Queryable.cs b/Src/Asp.Net/SqlServerTest/Demo/Demo1_Queryable.cs index 81e3ff66d..b2d929dcf 100644 --- a/Src/Asp.Net/SqlServerTest/Demo/Demo1_Queryable.cs +++ b/Src/Asp.Net/SqlServerTest/Demo/Demo1_Queryable.cs @@ -37,26 +37,27 @@ namespace OrmTest }).ToList(); var list2 = db.Queryable().Select(it => new OrderItem { - ItemId = SqlFunc.GetSelfAndAutoFill(it.ItemId), + ItemId = it.ItemId.SelectAll(), OrderName = it.OrderId.GetConfigValue("02") }).ToList(); var list3 = db.Queryable().Select(it => new OrderItem { - ItemId = SqlFunc.GetSelfAndAutoFill(it.ItemId), + ItemId = it.ItemId.SelectAll(), OrderName = it.OrderId.GetConfigValue() }).ToList(); var list4 = db.Queryable().Select(it => new OrderItem { - ItemId = SqlFunc.GetSelfAndAutoFill(it.ItemId), + ItemId = it.ItemId.SelectAll(), OrderName = it.OrderId.GetConfigValue() }) - .Where(it=>it.OrderId.GetConfigValue()=="jack") + .Where(it=>it.OrderId.GetConfigValue()== "order1") .OrderBy(it=>it.OrderId.GetConfigValue()).ToList(); - var list5 = db.Queryable((o, i, c) => o.Id == i.OrderId && c.Id == o.CustomId) - .Select((o,i,c)=>new ViewOrder() { - Id=SqlFunc.GetSelfAndAutoFill(o.Id), + var list5 = db.Queryable((o, i) => o.Id == i.OrderId) + .OrderBy((o,i)=>i.OrderId.GetConfigValue(),OrderByType.Desc) + .Select((o,i)=>new ViewOrder() { + Id= o.Id.SelectAll(), Name=i.OrderId.GetConfigValue() }) .ToList(); diff --git a/Src/Asp.Net/SqlServerTest/Models/OrderItem.cs b/Src/Asp.Net/SqlServerTest/Models/OrderItem.cs index 7401b81a1..fb7d0a7d9 100644 --- a/Src/Asp.Net/SqlServerTest/Models/OrderItem.cs +++ b/Src/Asp.Net/SqlServerTest/Models/OrderItem.cs @@ -14,18 +14,6 @@ namespace OrmTest public decimal? Price { get; set; } [SqlSugar.SugarColumn(IsNullable = true)] public DateTime? CreateTime { get; set; } - [SqlSugar.SugarColumn(IsNullable = true)] - public string OrderName { get; set; } - } - [SqlSugar.SugarTable("OrderDetail")] - public class VOrderItem - { - [SqlSugar.SugarColumn(IsPrimaryKey = true, IsIdentity = true)] - public int ItemId { get; set; } - public int OrderId { get; set; } - public decimal? Price { get; set; } - [SqlSugar.SugarColumn(IsNullable = true)] - public DateTime? CreateTime { get; set; } [SqlSugar.SugarColumn(IsIgnore = true)] public string OrderName { get; set; } }