From fdabf96e523065218de594c25eb13da5f4eac852 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期一, 15 七月 2024 08:09:35 +0800
Subject: [PATCH] 盘点
---
Wms/WMS.BLL/LogServer/OperationCrServer.cs | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/Wms/WMS.BLL/LogServer/OperationCrServer.cs b/Wms/WMS.BLL/LogServer/OperationCrServer.cs
index 253df18..0a660f3 100644
--- a/Wms/WMS.BLL/LogServer/OperationCrServer.cs
+++ b/Wms/WMS.BLL/LogServer/OperationCrServer.cs
@@ -27,7 +27,7 @@
{
_userManager = userManager;
}
- public List<OperationDto> GetLogOperationCrList(string menuName, string type, string msg, string startTime, string endTime, int page, int limit, out int count)
+ public async Task<List<OperationDto>> GetLogOperationCrList(string menuName, string type, string msg, string startTime, string endTime, int page, int limit, RefAsync<int> count)
{
try
{
@@ -38,8 +38,7 @@
.AndIF(!string.IsNullOrWhiteSpace(startTime), it => it.CreateTime >= Convert.ToDateTime(startTime))
.AndIF(!string.IsNullOrWhiteSpace(endTime), it => it.CreateTime <= Convert.ToDateTime(endTime).AddDays(1))
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
- var total = 0;
- var list = GetAllWhereAsync(item)
+ var list = await GetAllWhereAsync(item)
.LeftJoin<SysDictionary>((it, dic) => it.Type == dic.Id.ToString())
.LeftJoin<SysUserInfor>((it, dic, users) => it.CreateUser == users.Id)
.Select((it, dic, users) => new OperationDto()
@@ -55,10 +54,8 @@
CreateUserName = users.RealName,
})
.OrderByDescending(it => it.CreateTime)
- .ToOffsetPage(page, limit, ref total);
-
- count = total;
- return list.OrderByDescending(m => m.CreateTime).ToList();
+ .ToPageListAsync(page, limit, count);
+ return list;
}
catch (Exception e)
{
--
Gitblit v1.8.0