mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-09-24 04:53:45 +08:00
Synchronization code
This commit is contained in:
@@ -101,6 +101,8 @@ namespace SqlSugar
|
|||||||
return string.Format("(CAST(TO_CHAR({0},'mi') AS NUMBER))", parameter.MemberName);
|
return string.Format("(CAST(TO_CHAR({0},'mi') AS NUMBER))", parameter.MemberName);
|
||||||
case DateType.Millisecond:
|
case DateType.Millisecond:
|
||||||
return string.Format("(CAST(TO_CHAR({0},'ff3') AS NUMBER))", parameter.MemberName);
|
return string.Format("(CAST(TO_CHAR({0},'ff3') AS NUMBER))", parameter.MemberName);
|
||||||
|
case DateType.Weekday:
|
||||||
|
return $" (TO_NUMBER(TO_CHAR({parameter.MemberName}, 'D'))-1) ";
|
||||||
case DateType.Day:
|
case DateType.Day:
|
||||||
default:
|
default:
|
||||||
return string.Format("(CAST(TO_CHAR({0},'dd') AS NUMBER))", parameter.MemberName);
|
return string.Format("(CAST(TO_CHAR({0},'dd') AS NUMBER))", parameter.MemberName);
|
||||||
|
@@ -51,11 +51,25 @@ namespace SqlSugar
|
|||||||
var parameter2 = model.Args[1];
|
var parameter2 = model.Args[1];
|
||||||
if (parameter.MemberName != null && parameter.MemberName is DateTime)
|
if (parameter.MemberName != null && parameter.MemberName is DateTime)
|
||||||
{
|
{
|
||||||
return string.Format(" {0}('{1}') ", parameter2.MemberValue, parameter.MemberName);
|
if (parameter2.MemberValue?.ToString() == DateType.Weekday.ToString())
|
||||||
|
{
|
||||||
|
return string.Format(" case when {0}('{1}')=6 then 0 else ({0}('{1}')+1) end ", parameter2.MemberValue, parameter.MemberName);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return string.Format(" {0}('{1}') ", parameter2.MemberValue, parameter.MemberName);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return string.Format(" {0}({1}) ", parameter2.MemberValue, parameter.MemberName);
|
if (parameter2.MemberValue?.ToString() == DateType.Weekday.ToString())
|
||||||
|
{
|
||||||
|
return string.Format(" case when {0}({1})=6 then 0 else ({0}({1})+1) end ", parameter2.MemberValue, parameter.MemberName);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return string.Format(" {0}({1}) ", parameter2.MemberValue, parameter.MemberName);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -213,7 +213,7 @@ namespace SqlSugar
|
|||||||
case DateType.Millisecond:
|
case DateType.Millisecond:
|
||||||
return string.Format("(CAST(TO_CHAR({0},'ff3') AS NUMBER))", parameter.MemberName);
|
return string.Format("(CAST(TO_CHAR({0},'ff3') AS NUMBER))", parameter.MemberName);
|
||||||
case DateType.Weekday:
|
case DateType.Weekday:
|
||||||
return $" to_char({parameter.MemberName},'day') ";
|
return $" (TO_NUMBER(TO_CHAR({parameter.MemberName}, 'D'))-1) ";
|
||||||
case DateType.Day:
|
case DateType.Day:
|
||||||
default:
|
default:
|
||||||
return string.Format("(CAST(TO_CHAR({0},'dd') AS NUMBER))", parameter.MemberName);
|
return string.Format("(CAST(TO_CHAR({0},'dd') AS NUMBER))", parameter.MemberName);
|
||||||
|
@@ -59,11 +59,25 @@ namespace SqlSugar
|
|||||||
var parameter2 = model.Args[1];
|
var parameter2 = model.Args[1];
|
||||||
if (parameter.MemberName != null && parameter.MemberName is DateTime)
|
if (parameter.MemberName != null && parameter.MemberName is DateTime)
|
||||||
{
|
{
|
||||||
return string.Format(" datepart({0},'{1}') ", parameter2.MemberValue, parameter.MemberName);
|
if (parameter2.MemberValue?.ToString() == DateType.Weekday.ToString())
|
||||||
|
{
|
||||||
|
return string.Format(" (datepart({0},'{1}')-1) ", parameter2.MemberValue, parameter.MemberName);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return string.Format(" datepart({0},'{1}') ", parameter2.MemberValue, parameter.MemberName);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return string.Format(" datepart({0},{1}) ", parameter2.MemberValue, parameter.MemberName);
|
if (parameter2.MemberValue?.ToString() == DateType.Weekday.ToString())
|
||||||
|
{
|
||||||
|
return string.Format(" (datepart({0},{1})-1) ", parameter2.MemberValue, parameter.MemberName);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return string.Format(" datepart({0},{1}) ", parameter2.MemberValue, parameter.MemberName);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public override string HasValue(MethodCallExpressionModel model)
|
public override string HasValue(MethodCallExpressionModel model)
|
||||||
|
Reference in New Issue
Block a user