diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml index 4854f49c..132d875e 100644 --- a/FreeSql.DbContext/FreeSql.DbContext.xml +++ b/FreeSql.DbContext/FreeSql.DbContext.xml @@ -125,13 +125,6 @@ 清空状态数据 - - - 根据 lambda 条件删除数据 - - - - 添加 @@ -486,14 +479,5 @@ - - - 批量注入 Repository,可以参考代码自行调整 - - - - - - diff --git a/FreeSql.Tests/FreeSql.Tests/Issues/306.cs b/FreeSql.Tests/FreeSql.Tests/Issues/306.cs new file mode 100644 index 00000000..c5748a23 --- /dev/null +++ b/FreeSql.Tests/FreeSql.Tests/Issues/306.cs @@ -0,0 +1,62 @@ +using FreeSql.DataAnnotations; +using System; +using System.Collections.Generic; +using System.Text; +using Xunit; + +namespace FreeSql.Tests.Issues +{ + public class _306 + { + [Fact] + public void SelectTest() + { + IFreeSql db = g.sqlserver; + + db.Select() + .InnerJoin((a, b) => a.MeterSN == b.MeterSN) + .ToAggregate((a, b) => new VM_PeriodEnergy + { + Sharp = a.Sum(a.Key.Sharp), + Peak = a.Sum(a.Key.Peak), + Shoulder = a.Sum(a.Key.Shoulder), + Off = a.Sum(a.Key.Off), + }); + } + + public class ElectricEnergyValue + { + public int ID { get; set; } + + public string MeterSN { get; set; } + + public DateTime CollectTime { get; set; } + + public decimal Sharp { get; set; } + + public decimal Peak { get; set; } + + public decimal Shoulder { get; set; } + + public decimal Off { get; set; } + } + + public class BranchMeter + { + public int BranchID { get; set; } + + public string MeterSN { get; set; } + } + + public class VM_PeriodEnergy + { + public decimal Sharp { get; set; } + + public decimal Peak { get; set; } + + public decimal Shoulder { get; set; } + + public decimal Off { get; set; } + } + } +}