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

Merge branch 'master' of github.com:donet5/SqlSugar

Browse Source
This commit is contained in:
sunkaixuan 2023-07-21 14:13:53 +08:00
commit b7608be6ab
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/QueryableProvider02-05.cs
View File

@ -361,6 +361,16 @@ namespace SqlSugar
} }
return this; return this;
} }
public new virtual ISugarQueryable<T, T2> GroupByIF(bool isGroupBy, string groupFields)
{
if (isGroupBy)
{
GroupBy(groupFields);
}
return this;
}
public new virtual ISugarQueryable<T, T2> HavingIF(bool isHaving, Expression<Func<T, bool>> expression) public new virtual ISugarQueryable<T, T2> HavingIF(bool isHaving, Expression<Func<T, bool>> expression)
{ {
if (isHaving) if (isHaving)
@ -855,6 +865,16 @@ namespace SqlSugar
} }
return this; return this;
} }
public new virtual ISugarQueryable<T, T2, T3> GroupByIF(bool isGroupBy, string groupFields)
{
if (isGroupBy)
{
GroupBy(groupFields);
}
return this;
}
public ISugarQueryable<T, T2, T3> GroupBy(Expression<Func<T, T2, T3, object>> expression) public ISugarQueryable<T, T2, T3> GroupBy(Expression<Func<T, T2, T3, object>> expression)
{ {
_GroupBy(expression); _GroupBy(expression);
@ -1763,6 +1783,16 @@ namespace SqlSugar
} }
return this; return this;
} }
public new virtual ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy, string groupFields)
{
if (isGroupBy)
{
GroupBy(groupFields);
}
return this;
}
public new ISugarQueryable<T, T2, T3, T4> GroupBy(Expression<Func<T, object>> expression) public new ISugarQueryable<T, T2, T3, T4> GroupBy(Expression<Func<T, object>> expression)
{ {
_GroupBy(expression); _GroupBy(expression);

3
Src/Asp.NetCore2/SqlSugar/Interface/IQueryable.cs
View File

@ -346,6 +346,7 @@ namespace SqlSugar
ISugarQueryable<T, T2> GroupBy(Expression<Func<T, T2, object>> expression); ISugarQueryable<T, T2> GroupBy(Expression<Func<T, T2, object>> expression);
new ISugarQueryable<T, T2> GroupByIF(bool isGroupBy, Expression<Func<T, object>> expression); new ISugarQueryable<T, T2> GroupByIF(bool isGroupBy, Expression<Func<T, object>> expression);
ISugarQueryable<T, T2> GroupByIF(bool isGroupBy, Expression<Func<T,T2, object>> expression); ISugarQueryable<T, T2> GroupByIF(bool isGroupBy, Expression<Func<T,T2, object>> expression);
ISugarQueryable<T, T2> GroupByIF(bool isGroupBy, string groupFields);
new ISugarQueryable<T, T2> Having(Expression<Func<T, bool>> expression); new ISugarQueryable<T, T2> Having(Expression<Func<T, bool>> expression);
ISugarQueryable<T, T2> Having(Expression<Func<T, T2, bool>> expression); ISugarQueryable<T, T2> Having(Expression<Func<T, T2, bool>> expression);
new ISugarQueryable<T, T2> Having(string whereString, object whereObj = null); new ISugarQueryable<T, T2> Having(string whereString, object whereObj = null);
@ -475,6 +476,7 @@ namespace SqlSugar
new ISugarQueryable<T, T2, T3> GroupByIF(bool isGroupBy, Expression<Func<T, object>> expression); new ISugarQueryable<T, T2, T3> GroupByIF(bool isGroupBy, Expression<Func<T, object>> expression);
ISugarQueryable<T, T2, T3> GroupByIF(bool isGroupBy, Expression<Func<T, T2, object>> expression); ISugarQueryable<T, T2, T3> GroupByIF(bool isGroupBy, Expression<Func<T, T2, object>> expression);
ISugarQueryable<T, T2,T3> GroupByIF(bool isGroupBy, Expression<Func<T, T2,T3, object>> expression); ISugarQueryable<T, T2,T3> GroupByIF(bool isGroupBy, Expression<Func<T, T2,T3, object>> expression);
new ISugarQueryable<T, T2, T3> GroupByIF(bool isGroupBy, string groupFields);
new ISugarQueryable<T, T2, T3> Having(Expression<Func<T, bool>> expression); new ISugarQueryable<T, T2, T3> Having(Expression<Func<T, bool>> expression);
ISugarQueryable<T, T2, T3> Having(Expression<Func<T, T2, bool>> expression); ISugarQueryable<T, T2, T3> Having(Expression<Func<T, T2, bool>> expression);
ISugarQueryable<T, T2, T3> Having(Expression<Func<T, T2, T3, bool>> expression); ISugarQueryable<T, T2, T3> Having(Expression<Func<T, T2, T3, bool>> expression);
@ -615,6 +617,7 @@ namespace SqlSugar
ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy, Expression<Func<T, T2, object>> expression); ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy, Expression<Func<T, T2, object>> expression);
ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy, Expression<Func<T, T2, T3, object>> expression); ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy, Expression<Func<T, T2, T3, object>> expression);
ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy, Expression<Func<T, T2, T3,T4, object>> expression); ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy, Expression<Func<T, T2, T3,T4, object>> expression);
new ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy, string groupFields);
new ISugarQueryable<T, T2, T3, T4> Having(Expression<Func<T, bool>> expression); new ISugarQueryable<T, T2, T3, T4> Having(Expression<Func<T, bool>> expression);
ISugarQueryable<T, T2, T3, T4> Having(Expression<Func<T, T2, bool>> expression); ISugarQueryable<T, T2, T3, T4> Having(Expression<Func<T, T2, bool>> expression);
ISugarQueryable<T, T2, T3, T4> Having(Expression<Func<T, T2, T3, bool>> expression); ISugarQueryable<T, T2, T3, T4> Having(Expression<Func<T, T2, T3, bool>> expression);