update 封装分页,排序,过滤字段
This commit is contained in:
@@ -2491,19 +2491,6 @@
|
||||
</summary>
|
||||
<param name="dict"></param>
|
||||
</member>
|
||||
<member name="T:Ewide.Core.Extension.PageInputOrder">
|
||||
<summary>
|
||||
通用输入帮助类
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:Ewide.Core.Extension.PageInputOrder.OrderBuilder(Ewide.Core.PageInputBase,System.Boolean)">
|
||||
<summary>
|
||||
排序方式(默认降序)
|
||||
</summary>
|
||||
<param name="pageInput"></param>
|
||||
<param name="descSort">是否降序</param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="T:Ewide.Core.XnInputBase">
|
||||
<summary>
|
||||
通用输入扩展参数(带权限)
|
||||
|
||||
45
Api/Ewide.Core/Extension/PageExtensions.cs
Normal file
45
Api/Ewide.Core/Extension/PageExtensions.cs
Normal file
@@ -0,0 +1,45 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Linq.Dynamic.Core;
|
||||
using System.Linq.Expressions;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Furion.DatabaseAccessor;
|
||||
using Furion.DatabaseAccessor.Extensions;
|
||||
using Mapster;
|
||||
|
||||
namespace Ewide.Core.Extension
|
||||
{
|
||||
public static class PageExtensions
|
||||
{
|
||||
public static string OrderBuilder<T>(PageInputBase pageInput, bool descSort = true)
|
||||
{
|
||||
var type = typeof(T);
|
||||
var hasId = type.GetProperty("Id") == null;
|
||||
|
||||
var defaultField = hasId ? "Sort" : "Id";
|
||||
|
||||
// 约定默认每张表都有Id排序
|
||||
var orderStr = defaultField + (descSort ? " Desc" : " Asc");
|
||||
|
||||
// 排序是否可用-排序字段和排序顺序都为非空才启用排序
|
||||
if (!string.IsNullOrEmpty(pageInput.SortField) && !string.IsNullOrEmpty(pageInput.SortOrder))
|
||||
{
|
||||
orderStr = $"{pageInput.SortField} {(pageInput.SortOrder == pageInput.DescStr ? "Desc" : "Asc")}";
|
||||
}
|
||||
return orderStr;
|
||||
}
|
||||
|
||||
public static Task<PagedList<T>> ToPageData<T>(this IQueryable<T> source, PageInputBase input) where T : new()
|
||||
{
|
||||
return source.OrderBy(OrderBuilder<T>(input)).ToPagedListAsync(input.PageNo, input.PageSize);
|
||||
}
|
||||
|
||||
public static Task<PagedList<O>> ToPageData<T, O>(this IQueryable<T> source, PageInputBase input) where O : new()
|
||||
{
|
||||
return source.OrderBy(OrderBuilder<T>(input)).Select(u => u.Adapt<O>()).ToPagedListAsync(input.PageNo, input.PageSize);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Ewide.Core.Extension
|
||||
{
|
||||
/// <summary>
|
||||
/// 通用输入帮助类
|
||||
/// </summary>
|
||||
public class PageInputOrder
|
||||
{
|
||||
/// <summary>
|
||||
/// 排序方式(默认降序)
|
||||
/// </summary>
|
||||
/// <param name="pageInput"></param>
|
||||
/// <param name="descSort">是否降序</param>
|
||||
/// <returns></returns>
|
||||
public static string OrderBuilder(PageInputBase pageInput, bool descSort = true)
|
||||
{
|
||||
// 约定默认每张表都有Id排序
|
||||
var orderStr = descSort ? "Id Desc" : "Id Asc";
|
||||
|
||||
// 排序是否可用-排序字段和排序顺序都为非空才启用排序
|
||||
if (!string.IsNullOrEmpty(pageInput.SortField) && !string.IsNullOrEmpty(pageInput.SortOrder))
|
||||
{
|
||||
orderStr = $"{pageInput.SortField} {(pageInput.SortOrder == pageInput.DescStr ? "Desc" : "Asc")}";
|
||||
}
|
||||
return orderStr;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
using Furion.DatabaseAccessor;
|
||||
using Ewide.Core.Extension;
|
||||
using Furion.DatabaseAccessor;
|
||||
using Furion.DatabaseAccessor.Extensions;
|
||||
using Furion.DependencyInjection;
|
||||
using Furion.DynamicApiController;
|
||||
@@ -69,13 +70,16 @@ namespace Ewide.Core.Service
|
||||
[HttpGet("/sysApp/page")]
|
||||
public async Task<dynamic> QueryAppPageList([FromQuery] AppInput input)
|
||||
{
|
||||
var name = !string.IsNullOrEmpty(input.Name?.Trim());
|
||||
var code = !string.IsNullOrEmpty(input.Code?.Trim());
|
||||
var apps = await _sysAppRep.DetachedEntities
|
||||
.Where((name, u => EF.Functions.Like(u.Name, $"%{input.Name.Trim()}%")),
|
||||
(code, u => EF.Functions.Like(u.Code, $"%{input.Code.Trim()}%")))
|
||||
//.Where(u => u.Status == (int)CommonStatus.ENABLE)
|
||||
.ToPagedListAsync(input.PageNo, input.PageSize);
|
||||
.Where(
|
||||
!string.IsNullOrEmpty(input.Name?.Trim()),
|
||||
u => EF.Functions.Like(u.Name, $"%{input.Name.Trim()}%")
|
||||
)
|
||||
.Where(
|
||||
!string.IsNullOrEmpty(input.Code?.Trim()),
|
||||
u => EF.Functions.Like(u.Code, $"%{input.Code.Trim()}%")
|
||||
)
|
||||
.ToPageData(input);
|
||||
return XnPageResult<SysApp>.PageResult(apps);
|
||||
}
|
||||
|
||||
|
||||
@@ -43,9 +43,7 @@ namespace Ewide.Core.Service
|
||||
.Where(success, u => u.Success == input.Success.Value)
|
||||
.Where(searchBeginTime, u => u.OpTime >= DateTime.Parse(input.SearchBeginTime.Trim()) &&
|
||||
u.OpTime <= DateTime.Parse(input.SearchEndTime.Trim()))
|
||||
.OrderBy(PageInputOrder.OrderBuilder(input)) // 封装了任意字段排序示例
|
||||
.Select(u => u.Adapt<OpLogOutput>())
|
||||
.ToPagedListAsync(input.PageNo, input.PageSize);
|
||||
.ToPageData<SysLogOp, OpLogOutput>(input);
|
||||
return XnPageResult<OpLogOutput>.PageResult(opLogs);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using Furion.DatabaseAccessor;
|
||||
using Ewide.Core.Extension;
|
||||
using Furion.DatabaseAccessor;
|
||||
using Furion.DatabaseAccessor.Extensions;
|
||||
using Furion.DependencyInjection;
|
||||
using Furion.DynamicApiController;
|
||||
@@ -41,9 +42,7 @@ namespace Ewide.Core.Service
|
||||
.Where(success, u => u.Success == input.Success.Value)
|
||||
.Where(searchBeginTime, u => u.VisTime >= DateTime.Parse(input.SearchBeginTime.Trim()) &&
|
||||
u.VisTime <= DateTime.Parse(input.SearchEndTime.Trim()))
|
||||
.OrderByDescending(u => u.Id)
|
||||
.Select(u => u.Adapt<VisLogOutput>())
|
||||
.ToPagedListAsync(input.PageNo, input.PageSize);
|
||||
.ToPageData<SysLogVis, VisLogOutput>(input);
|
||||
return XnPageResult<VisLogOutput>.PageResult(visLogs);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user