diff --git a/Api/Ewide.Core/Ewide.Core.xml b/Api/Ewide.Core/Ewide.Core.xml index b506036..6a33170 100644 --- a/Api/Ewide.Core/Ewide.Core.xml +++ b/Api/Ewide.Core/Ewide.Core.xml @@ -2528,7 +2528,7 @@ 查询多个条件 - + 查询运算符 @@ -2634,7 +2634,7 @@ 降序排序(不要问我为什么是descend不是desc,前端约定参数就是这样) - + 查询条件 diff --git a/Api/Ewide.Core/Extension/DataFilter/Entity/FilterInfo.cs b/Api/Ewide.Core/Extension/DataFilter/Entity/FilterInfo.cs index d54c7eb..aebdd29 100644 --- a/Api/Ewide.Core/Extension/DataFilter/Entity/FilterInfo.cs +++ b/Api/Ewide.Core/Extension/DataFilter/Entity/FilterInfo.cs @@ -45,7 +45,7 @@ namespace Ewide.Core.Extension.DataFilter.Entity var searchInfo = new SearchInfo(); searchInfo.Field = fieldName; - searchInfo.QueryTypeStr = elem.QueryTypeStr; + searchInfo.Type = elem.Type; var searchStrsNode = elem.Value; if (searchStrsNode != null) { diff --git a/Api/Ewide.Core/Extension/DataFilter/Entity/SearchInfo.cs b/Api/Ewide.Core/Extension/DataFilter/Entity/SearchInfo.cs index 8dbc183..bc99bc0 100644 --- a/Api/Ewide.Core/Extension/DataFilter/Entity/SearchInfo.cs +++ b/Api/Ewide.Core/Extension/DataFilter/Entity/SearchInfo.cs @@ -23,7 +23,7 @@ namespace Ewide.Core /// /// 查询运算符 /// - public string QueryTypeStr { get; set; } + public string Type { get; set; } private string _QueryTypeStr; @@ -60,7 +60,7 @@ namespace Ewide.Core public SearchInfo() { Value = new List(); - _QueryTypeStr = QueryTypeStr; + _QueryTypeStr = Type; } } } diff --git a/Api/Ewide.Core/Extension/DataFilter/IDataFilterSqlStringBuilderService.cs b/Api/Ewide.Core/Extension/DataFilter/IDataFilterSqlStringBuilderService.cs deleted file mode 100644 index fda8ffb..0000000 --- a/Api/Ewide.Core/Extension/DataFilter/IDataFilterSqlStringBuilderService.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Dapper; - -namespace Ewide.Core.Extension.DataFilter -{ - public interface IDataFilterSqlStringBuilderService - { - DynamicParameters[] GetDataParameter(); - } -} diff --git a/Api/Ewide.Core/Extension/DataFilter/WebPage/SearchJsonFitlerInfoGetService.cs b/Api/Ewide.Core/Extension/DataFilter/WebPage/SearchJsonFitlerInfoGetService.cs index a02c2cb..b0cfa2b 100644 --- a/Api/Ewide.Core/Extension/DataFilter/WebPage/SearchJsonFitlerInfoGetService.cs +++ b/Api/Ewide.Core/Extension/DataFilter/WebPage/SearchJsonFitlerInfoGetService.cs @@ -31,7 +31,7 @@ namespace Ewide.Core.Extension.DataFilter.WebPage public FilterInfo GetFilterInfo() { var result = new FilterInfo(); - result.SetSearchInfo(Input._Search); + result.SetSearchInfo(Input.SearchInfo); return result; } @@ -57,11 +57,6 @@ namespace Ewide.Core.Extension.DataFilter.WebPage return baseSql + result.ToString(); } - public DynamicParameters GetParams() - { - return sqlParameters; - } - #region 私有方法 private string GetWhereSqlBuild(SearchInfo searchInfo) { @@ -72,7 +67,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); - whereList.Add(String.Format(sqlT, searchInfo.Field, GetSearchOperatorStr(searchInfo.QueryType), parameterName)); + whereList.Add(String.Format(sqlT, searchInfo.Field, searchInfo.Type, parameterName)); } if (whereList.Count == 0) return String.Empty; var resultT = "({0})"; @@ -80,26 +75,6 @@ namespace Ewide.Core.Extension.DataFilter.WebPage return result; } - - private string GetSearchOperatorStr(QueryTypeEnum searchOperator) - { - switch (searchOperator) - { - case QueryTypeEnum.GreaterThan: - return ">"; - case QueryTypeEnum.GreaterThanOrEqual: - return ">="; - case QueryTypeEnum.LessThan: - return "<"; - case QueryTypeEnum.LessThanOrEqual: - return "<="; - case QueryTypeEnum.Like: - return " LIKE "; - default: - return "="; - } - } - private void AddParameter(string key, object value) { //var parameter = _SqlParameters.ParameterNames.FirstOrDefault(m => m == key); diff --git a/Api/Ewide.Core/Extension/InputBase.cs b/Api/Ewide.Core/Extension/InputBase.cs index 0dad7e1..0b86364 100644 --- a/Api/Ewide.Core/Extension/InputBase.cs +++ b/Api/Ewide.Core/Extension/InputBase.cs @@ -75,7 +75,7 @@ namespace Ewide.Core /// /// 查询条件 /// - public virtual SearchInfo[] _Search { get; set; } + public virtual SearchInfo[] SearchInfo { get; set; } } }