From 2404ad68d1c24583798546b5b0fd7519debbd663 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期一, 15 七月 2024 08:10:46 +0800
Subject: [PATCH] 合并
---
Wms/WMS.BLL/LogServer/TaskServer.cs | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/Wms/WMS.BLL/LogServer/TaskServer.cs b/Wms/WMS.BLL/LogServer/TaskServer.cs
index 7a5748a..582b27e 100644
--- a/Wms/WMS.BLL/LogServer/TaskServer.cs
+++ b/Wms/WMS.BLL/LogServer/TaskServer.cs
@@ -3,6 +3,7 @@
using System.Linq;
using System.Linq.Expressions;
using System.Text;
+using System.Threading.Tasks;
using Model.ModelDto.BllSoDto;
using Model.ModelDto.LogDto;
using SqlSugar;
@@ -22,7 +23,7 @@
}
- public List<TaskDto> GetTaskList(List<string> orderType, string type, string status, string taskNo, int isSuccess, string palletNo, string msg, int page, int limit, out int count)
+ public async Task<List<TaskDto>> GetTaskList(List<string> orderType, string type, string status, string taskNo, int isSuccess, string palletNo, string msg, int page, int limit, RefAsync<int> count)
{
try
{
@@ -35,8 +36,7 @@
.AndIF(!string.IsNullOrWhiteSpace(palletNo), it => it.PalletNo.Contains(palletNo.Trim()))
.AndIF(!string.IsNullOrWhiteSpace(msg), it => it.Msg.Contains(msg.Trim()))
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
- var total = 0;
- var data = GetAllWhereAsync(item)
+ var data = await GetAllWhereAsync(item)
.LeftJoin<SysUserInfor>((a,b)=>a.CreateUser == b.Id).
Select((a,b) => new TaskDto()
{
@@ -67,10 +67,9 @@
CreateTime = a.CreateTime
})
.OrderByDescending(a => a.TaskNo)
- .ToOffsetPage(page,limit,ref total);
- count = total;
+ .ToPageListAsync(page,limit, count);
- return data.OrderByDescending(m=>m.TaskNo).ToList();
+ return data;
}
catch (Exception e)
{
--
Gitblit v1.8.0