lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2026-02-25 04:27:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/DotNetNext/SqlSugar

Browse Source
This commit is contained in:
sunkaixuan
2025-12-18 15:20:46 +08:00
parent d5929415ec 2c71065fb4
commit 9be9d8d4ba
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Src/Asp.NetCore2/SqlSugar.GBaseCore/GBase/SqlBuilder/GBaseExpressionContext.cs
View File

@@ -6,7 +6,7 @@ using System.Linq;
using System.Linq.Expressions; using System.Linq.Expressions;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace SqlSugar.GBase namespace SqlSugar.GBase
{ {
@@ -21,7 +21,7 @@ namespace SqlSugar.GBase
public override string SqlTranslationRight { get { return ""; } } public override string SqlTranslationRight { get { return ""; } }
public override bool IsTranslationText(string name) public override bool IsTranslationText(string name)
{ {
var result = name.IsContainsIn( UtilConstants.Space,"(",")"); var result = name.IsContainsIn(UtilConstants.Space, "(", ")");
return result; return result;
} }
public override string GetLimit() { return ""; } public override string GetLimit() { return ""; }
@@ -60,7 +60,7 @@ namespace SqlSugar.GBase
{ {
if (parameter1.MemberValue.GetType() == UtilConstants.DateType) if (parameter1.MemberValue.GetType() == UtilConstants.DateType)
{ {
str = string.Format("NVL({0} {2},{1} {2})", parameter.MemberName, parameter1.MemberName, "::"+_dateTimeType); str = string.Format("NVL({0} {2},{1} {2})", parameter.MemberName, parameter1.MemberName, "::" + _dateTimeType);
} }
} }
return str; return str;
@@ -101,13 +101,16 @@ namespace SqlSugar.GBase
switch (parameter2.MemberValue.ToString().ToLower()) switch (parameter2.MemberValue.ToString().ToLower())
{ {
case "year": case "year":
str = string.Format(" year('{0}'::{1}) ", parameter.MemberName, _dateTimeType); str = string.Format(" year({0} :: {1}) ", parameter.MemberName, _dateTimeType);
//str = string.Format(" to_char({0} :: {1},'yyyy') ", parameter.MemberName, _dateTimeType);
break; break;
case "month": case "month":
str = string.Format(" month('{0}' :: {1}) ", parameter.MemberName, _dateTimeType); //str = string.Format(" month({0} :: {1}) ", parameter.MemberName, _dateTimeType);
str = string.Format(" to_char({0} :: {1},'MM') ", parameter.MemberName, _dateTimeType);
break; break;
case "day": case "day":
str = string.Format(" day('{0}' :: {1}) ", parameter.MemberName, _dateTimeType); //str = string.Format(" day({0} :: {1}) ", parameter.MemberName, _dateTimeType);
str = string.Format(" to_char({0} :: {1},'dd') ", parameter.MemberName, _dateTimeType);
break; break;
case "hour": case "hour":
str = string.Format(" to_char('{0}' :: {1},'hh24') ", parameter.MemberName, _dateTimeType); str = string.Format(" to_char('{0}' :: {1},'hh24') ", parameter.MemberName, _dateTimeType);
@@ -129,12 +132,15 @@ namespace SqlSugar.GBase
{ {
case "year": case "year":
str = string.Format(" year({0} :: {1}) ", parameter.MemberName, _dateTimeType); str = string.Format(" year({0} :: {1}) ", parameter.MemberName, _dateTimeType);
//str = string.Format(" to_char({0} :: {1},'yyyy') ", parameter.MemberName, _dateTimeType);
break; break;
case "month": case "month":
str = string.Format(" month({0} :: {1}) ", parameter.MemberName, _dateTimeType); //str = string.Format(" month({0} :: {1}) ", parameter.MemberName, _dateTimeType);
str = string.Format(" to_char({0} :: {1},'MM') ", parameter.MemberName, _dateTimeType);
break; break;
case "day": case "day":
str = string.Format(" day({0} :: {1}) ", parameter.MemberName, _dateTimeType); //str = string.Format(" day({0} :: {1}) ", parameter.MemberName, _dateTimeType);
str = string.Format(" to_char({0} :: {1},'dd') ", parameter.MemberName, _dateTimeType);
break; break;
case "hour": case "hour":
str = string.Format(" to_char({0} :: {1},'hh24') ", parameter.MemberName, _dateTimeType); str = string.Format(" to_char({0} :: {1},'hh24') ", parameter.MemberName, _dateTimeType);
@@ -249,7 +255,7 @@ namespace SqlSugar.GBase
public override string WeekOfYear(MethodCallExpressionModel mode) public override string WeekOfYear(MethodCallExpressionModel mode)
{ {
return string.Format(" week({0} :: {1},1) ", mode.Args[0].MemberName, _dateTimeType); return string.Format("lpad(week({0} :: {1},1),2,'0') ", mode.Args[0].MemberName, _dateTimeType);
} }
} }
} }