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

fix HouseCode查询条件完善

Browse Source 
update 动态查询新增startwith和endwith的like查询方式
This commit is contained in:
ky_yusj
2021-07-05 17:50:21 +08:00
parent 9a814faf4b
commit 4588ff56df
7 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Api/Ewide.Application/Service/HouseSafety/HouseCode/HouseCodeService.cs
View File

@@ -70,7 +70,7 @@ LEFT JOIN bs_house_projectinfo Proj ON Proj.Id=HC.ProjectId
LEFT JOIN sys_area_code CA ON CA.Code = Proj.AreaCode
LEFT JOIN sys_area_code RA ON RA.AdCode = SUBSTR(CA.AdCode,1,9)
LEFT JOIN sys_area_code AA ON AA.AdCode = SUBSTR(CA.AdCode,1,6) ";
return await _dapperRepository.QueryPageDataDynamic(sql, input, filterFields: new string[] {"Type", "Address", "HouseCode" });
return await _dapperRepository.QueryPageDataDynamic(sql, input, filterFields: new string[] {"Type", "Address", "HouseCode","AreaCode"});
}
[HttpGet("/houseCode/detail")]

14
Api/Ewide.Core/Enum/QueryTypeEnum.cs
View File

@@ -53,6 +53,18 @@ namespace Ewide.Core
/// 不为空
/// </summary>
[Description("不为空")]
IsNotNull = 7
IsNotNull = 7,
/// <summary>
/// 开始于 LIKE Param%
/// </summary>
[Description("LIKE Param%")]
StartWith =8,
/// <summary>
/// 结合于 LIKE %Param
/// </summary>
[Description("LIKE %Param")]
EndWith = 9
}
}

10
Api/Ewide.Core/Ewide.Core.xml
View File

@@ -2522,6 +2522,16 @@
不为空
</summary>
</member>
<member name="F:Ewide.Core.QueryTypeEnum.StartWith">
<summary>
开始于 LIKE Param%
</summary>
</member>
<member name="F:Ewide.Core.QueryTypeEnum.EndWith">
<summary>
结合于 LIKE %Param
</summary>
</member>
<member name="T:Ewide.Core.YesOrNot">
<summary>
菜单激活类型

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,
};
}

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

@@ -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";
}
}