🔄refactor: 统一返回给前端的数据结构

This commit is contained in:
yubaolee
2025-06-11 21:14:41 +08:00
parent 0b930dc6b4
commit 069991504c
52 changed files with 265 additions and 287 deletions

View File

@@ -14,7 +14,7 @@ namespace OpenAuth.App
/// <summary>
/// 加载列表
/// </summary>
public async Task<TableData> Load(QueryWmsInboundOrderDtblListReq request)
public async Task<PagedDynamicDataResp> Load(QueryWmsInboundOrderDtblListReq request)
{
var loginContext = _auth.GetCurrentUser();
if (loginContext == null)
@@ -26,7 +26,7 @@ namespace OpenAuth.App
{
throw new Exception("请在代码生成界面配置WmsInboundOrderDtbl表的字段属性");
}
var result = new TableData();
var result = new PagedDynamicDataResp();
var objs = SugarClient.Queryable<WmsInboundOrderDtbl>();
if (!string.IsNullOrEmpty(request.InboundOrderId))
{
@@ -37,11 +37,11 @@ namespace OpenAuth.App
objs = objs.Where(u => u.GoodsId.Contains(request.key));
}
var propertyStr = string.Join(',', properties.Select(u => u.ColumnName));
result.columnFields = properties;
result.data = objs.OrderBy(u => u.Id)
result.ColumnFields = properties;
result.Data = objs.OrderBy(u => u.Id)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).Select($"{propertyStr}").ToList();
result.count = await objs.CountAsync();
result.Count = await objs.CountAsync();
return result;
}
public void Add(AddOrUpdateWmsInboundOrderDtblReq request)

View File

@@ -15,7 +15,7 @@ namespace OpenAuth.App
/// <summary>
/// 加载列表
/// </summary>
public async Task<TableData> Load(QueryWmsInboundOrderTblListReq request)
public async Task<PagedDynamicDataResp> Load(QueryWmsInboundOrderTblListReq request)
{
var loginContext = _auth.GetCurrentUser();
if (loginContext == null)
@@ -27,8 +27,8 @@ namespace OpenAuth.App
{
throw new Exception("请在代码生成界面配置WmsInboundOrderTbl表的字段属性");
}
var result = new TableData();
result.columnFields = columns;
var result = new PagedDynamicDataResp();
result.ColumnFields = columns;
var objs = GetDataPrivilege("u");
if (!string.IsNullOrEmpty(request.key))
{
@@ -39,10 +39,10 @@ namespace OpenAuth.App
objs = objs.Where(request.sqlWhere);
}
var propertyStr = string.Join(',', columns.Select(u => u.ColumnName));
result.data = objs.OrderBy(u => u.Id)
result.Data = objs.OrderBy(u => u.Id)
.Skip((request.page - 1) * request.limit)
.Take(request.limit).Select($"{propertyStr}").ToList();
result.count = await objs.CountAsync();
result.Count = await objs.CountAsync();
return result;
}
public void Add(AddOrUpdateWmsInboundOrderTblReq request)