Update .net core project

This commit is contained in:
sunkaixuan
2022-08-23 17:50:16 +08:00
parent 1677bc135c
commit 458cf0d116
2 changed files with 90 additions and 1 deletions

View File

@@ -855,7 +855,14 @@ namespace SqlSugar
_GroupBy(expression);
return this;
}
public virtual ISugarQueryable<T> GroupByIF(bool isGroupBy,Expression<Func<T, object>> expression)
{
if (isGroupBy)
{
GroupBy(expression);
}
return this;
}
public virtual ISugarQueryable<T> OrderByIF(bool isOrderBy, string orderFileds)
{
if (isOrderBy)
@@ -3703,6 +3710,22 @@ namespace SqlSugar
#endregion
#region GroupBy
public new virtual ISugarQueryable<T,T2> GroupByIF(bool isGroupBy, Expression<Func<T, object>> expression)
{
if (isGroupBy)
{
GroupBy(expression);
}
return this;
}
public virtual ISugarQueryable<T, T2> GroupByIF(bool isGroupBy, Expression<Func<T, T2, object>> expression)
{
if (isGroupBy)
{
GroupBy(expression);
}
return this;
}
public new virtual ISugarQueryable<T,T2> HavingIF(bool isHaving, Expression<Func<T, bool>> expression)
{
if (isHaving)
@@ -4027,6 +4050,30 @@ namespace SqlSugar
}
#region Group
public new virtual ISugarQueryable<T, T2, T3> GroupByIF(bool isGroupBy, Expression<Func<T, object>> expression)
{
if (isGroupBy)
{
GroupBy(expression);
}
return this;
}
public virtual ISugarQueryable<T, T2, T3> GroupByIF(bool isGroupBy, Expression<Func<T, T2, object>> expression)
{
if (isGroupBy)
{
GroupBy(expression);
}
return this;
}
public virtual ISugarQueryable<T, T2, T3> GroupByIF(bool isGroupBy, Expression<Func<T, T2, T3, object>> expression)
{
if (isGroupBy)
{
GroupBy(expression);
}
return this;
}
public ISugarQueryable<T, T2, T3> GroupBy(Expression<Func<T, T2, T3, object>> expression)
{
_GroupBy(expression);
@@ -4729,6 +4776,38 @@ namespace SqlSugar
#endregion
#region GroupBy
public new virtual ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy, Expression<Func<T, object>> expression)
{
if (isGroupBy)
{
GroupBy(expression);
}
return this;
}
public virtual ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy, Expression<Func<T, T2, object>> expression)
{
if (isGroupBy)
{
GroupBy(expression);
}
return this;
}
public virtual ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy, Expression<Func<T, T2, T3, object>> expression)
{
if (isGroupBy)
{
GroupBy(expression);
}
return this;
}
public virtual ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy, Expression<Func<T, T2, T3,T4, object>> expression)
{
if (isGroupBy)
{
GroupBy(expression);
}
return this;
}
public new ISugarQueryable<T, T2, T3, T4> GroupBy(Expression<Func<T, object>> expression)
{
_GroupBy(expression);

View File

@@ -90,6 +90,7 @@ namespace SqlSugar
ISugarQueryable<T> GroupBy(Expression<Func<T, object>> expression);
ISugarQueryable<T> GroupBy(string groupFileds);
ISugarQueryable<T> GroupByIF(bool isGroupBy, Expression<Func<T, object>> expression);
ISugarQueryable<T> PartitionBy(Expression<Func<T, object>> expression);
ISugarQueryable<T> PartitionBy(string groupFileds);
@@ -257,6 +258,8 @@ namespace SqlSugar
#region GroupBy
new ISugarQueryable<T, T2> GroupBy(Expression<Func<T, object>> expression);
ISugarQueryable<T, T2> GroupBy(Expression<Func<T, T2, 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);
new ISugarQueryable<T, T2> Having(Expression<Func<T, bool>> expression);
ISugarQueryable<T, T2> Having(Expression<Func<T, T2, bool>> expression);
new ISugarQueryable<T, T2> Having(string whereString, object whereObj = null);
@@ -361,6 +364,9 @@ namespace SqlSugar
new ISugarQueryable<T, T2, T3> GroupBy(Expression<Func<T, object>> expression);
ISugarQueryable<T, T2, T3> GroupBy(Expression<Func<T, T2, object>> expression);
ISugarQueryable<T, T2, T3> GroupBy(Expression<Func<T, T2, T3, 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,T3, object>> 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, T3, bool>> expression);
@@ -479,6 +485,10 @@ namespace SqlSugar
ISugarQueryable<T, T2, T3, T4> GroupBy(Expression<Func<T, T2, object>> expression);
ISugarQueryable<T, T2, T3, T4> GroupBy(Expression<Func<T, T2, T3, object>> expression);
ISugarQueryable<T, T2, T3, T4> GroupBy(Expression<Func<T, T2, T3, T4, object>> expression);
new ISugarQueryable<T, T2, T3, T4> GroupByIF(bool isGroupBy,Expression<Func<T, 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,T4, object>> 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, T3, bool>> expression);