Skip to content

Commit 8ab7e76

Browse files
committed
1 parent 235a2c2 commit 8ab7e76

File tree

34 files changed

+112
-40
lines changed

34 files changed

+112
-40
lines changed

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<!--
1212
经常出于版本交叉问题,暂时关闭,在每个项目上设置版本号
1313
<PropertyGroup>
14-
<Version>3.2.694-preview20230331</Version>
14+
<Version>3.2.694</Version>
1515
</PropertyGroup>
1616
-->
1717

Examples/base_entity/Program.cs

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,24 @@ static void Main(string[] args)
577577
BaseEntity.Initialization(fsql, () => _asyncUow.Value);
578578
#endregion
579579

580+
var isusers01 = fsql.Select<Achievement>()
581+
.Where(e => e.Property("项目执行情况") == "结题")
582+
.GroupBy(e => new { ProjectLevel = e.Property("项目级别") })
583+
.ToSql(e => new
584+
{
585+
e.Key.ProjectLevel,
586+
Test = e.Value.Group.Property("批准经费总额(万元)"),
587+
});
588+
isusers01 = fsql.Select<Achievement>()
589+
.Where(e => e.Property("项目执行情况") == "结题")
590+
.GroupBy(e => new { ProjectLevel = e.Property("项目级别") })
591+
.WithTempQuery(e => new
592+
{
593+
e.Key.ProjectLevel,
594+
Test = e.Value.Group.Property("批准经费总额(万元)"),
595+
})
596+
.ToSql();
597+
580598
var bulkUsers = new[] {
581599
new IdentityUser1 { Nickname = "nickname11", Username = "username11" },
582600
new IdentityUser1 { Nickname = "nickname12", Username = "username12" },
@@ -2116,4 +2134,24 @@ class GoodsDataDTO
21162134
public string GoodsNo { get; set; }
21172135
public string GoodsName { get; set; }
21182136
}
2137+
2138+
[ExpressionCall]
2139+
public static class AchievementExpressionExtension
2140+
{
2141+
static ThreadLocal<ExpressionCallContext> context = new ThreadLocal<ExpressionCallContext>();
2142+
public static string Property(this Achievement achievement, string fieldName)
2143+
{
2144+
var ctx = context.Value;
2145+
var prefix = ctx.ParsedContent["achievement"];
2146+
prefix = prefix.Substring(0, prefix.IndexOf('.') + 1);
2147+
ctx.Result = prefix + $"`{fieldName}`";
2148+
return default;
2149+
}
2150+
}
2151+
[Table(DisableSyncStructure = true)]
2152+
public class Achievement
2153+
{
2154+
[Column(MapType = typeof(string))]
2155+
public Achievement Group { get; set; }
2156+
}
21192157
}

Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.694-preview20230331</Version>
21+
<Version>3.2.694</Version>
2222
</PropertyGroup>
2323

2424
<ItemGroup>

Extensions/FreeSql.Extensions.BaseEntity/FreeSql.Extensions.BaseEntity.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
2121
<LangVersion>latest</LangVersion>
22-
<Version>3.2.694-preview20230331</Version>
22+
<Version>3.2.694</Version>
2323
</PropertyGroup>
2424

2525
<ItemGroup>

Extensions/FreeSql.Extensions.JsonMap/FreeSql.Extensions.JsonMap.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.694-preview20230331</Version>
21+
<Version>3.2.694</Version>
2222
</PropertyGroup>
2323

2424
<ItemGroup>

Extensions/FreeSql.Extensions.LazyLoading/FreeSql.Extensions.LazyLoading.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<Title>$(AssemblyName)</Title>
1616
<IsPackable>true</IsPackable>
1717
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
18-
<Version>3.2.694-preview20230331</Version>
18+
<Version>3.2.694</Version>
1919
</PropertyGroup>
2020

2121
<ItemGroup>

Extensions/FreeSql.Extensions.Linq/FreeSql.Extensions.Linq.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<SignAssembly>true</SignAssembly>
1919
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
2020
<DelaySign>false</DelaySign>
21-
<Version>3.2.694-preview20230331</Version>
21+
<Version>3.2.694</Version>
2222
</PropertyGroup>
2323

2424
<ItemGroup>

Extensions/FreeSql.Generator/FreeSql.Generator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
1414
<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
1515
<PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
16-
<Version>3.2.694-preview20230331</Version>
16+
<Version>3.2.694</Version>
1717
</PropertyGroup>
1818

1919
<ItemGroup>

FreeSql.All/FreeSql.All.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<SignAssembly>true</SignAssembly>
1818
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
1919
<DelaySign>false</DelaySign>
20-
<Version>3.2.694-preview20230331</Version>
20+
<Version>3.2.694</Version>
2121
</PropertyGroup>
2222

2323
<ItemGroup>

FreeSql.DbContext/FreeSql.DbContext.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<SignAssembly>true</SignAssembly>
1818
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
1919
<DelaySign>false</DelaySign>
20-
<Version>3.2.694-preview20230331</Version>
20+
<Version>3.2.694</Version>
2121
</PropertyGroup>
2222

2323
<ItemGroup>

0 commit comments

Comments
 (0)