ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of http://118.178.224.202:3000/ewide/ewide_core

Browse Source
This commit is contained in:
自带大佬气场
2021-07-06 10:32:21 +08:00
parent 39d3a83a02 f5bdc7e1ab
commit b440bc2489
7 changed files with 50 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Api/Ewide.Core/Extension/DataFilter/Entity/SearchInfo.cs
View File

@@ -29,13 +29,15 @@ namespace Ewide.Core
{
get
{
return Type switch
return Type.ToLower() switch
{
"=" or "equal" => QueryTypeEnum.Equal,
"<" or "lessthan" => QueryTypeEnum.LessThan,
"<=" or "lessthanorequal" => QueryTypeEnum.LessThanOrEqual,
">" or "greaterthan" => QueryTypeEnum.GreaterThan,
">=" or "greaterthanorequal" => QueryTypeEnum.GreaterThanOrEqual,
"start" => QueryTypeEnum.StartWith,
"end" => QueryTypeEnum.EndWith,
_ => QueryTypeEnum.Like,
};
}

10
Api/Ewide.Core/Extension/DataFilter/WebPage/SearchJsonFitlerInfoGetService.cs
View File

@@ -56,7 +56,7 @@ namespace Ewide.Core.Extension.DataFilter.WebPage
#region 私有方法
private string GetWhereSqlBuild(SearchInfo searchInfo)
{
string sqlT = "`{0}`{1}{2}";
string sqlT = "`{0}` {1} {2}";
List<string> whereList = new List<string>();
foreach (var elem in searchInfo.Value)
{
@@ -64,7 +64,7 @@ namespace Ewide.Core.Extension.DataFilter.WebPage
var parameterName = "@" + searchInfo.Field + Guid.NewGuid().ToString("N");
//AddParameter(parameterName, elem);
sqlParameters.Add(parameterName, QueryTypeEnum.Like == searchInfo.QueryType ? "%" + elem + "%" : elem);
sqlParameters.Add(parameterName, QueryTypeEnum.Like == searchInfo.QueryType ? "%" + elem + "%" : QueryTypeEnum.StartWith == searchInfo.QueryType ? elem + "%" : QueryTypeEnum.EndWith == searchInfo.QueryType ? "%" + elem : elem);
whereList.Add(String.Format(sqlT, searchInfo.Field, GetSearchOperatorStr(searchInfo.QueryType), parameterName));
}
if (whereList.Count == 0) return String.Empty;
@@ -85,10 +85,10 @@ namespace Ewide.Core.Extension.DataFilter.WebPage
return "<";
case QueryTypeEnum.LessThanOrEqual:
return "<=";
case QueryTypeEnum.Like:
return " LIKE ";
default:
case QueryTypeEnum.Equal:
return "=";
default:
return "LIKE";
}
}