From bef9b53b4d3fdf423747576756e7c4d062e8c894 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Fri, 27 Oct 2023 16:24:44 +0800 Subject: [PATCH] bug --- EquipMgr/Tnb.EquipMgr.Entities/Dto/PadRepairListInput.cs | 7 +++---- EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Dto/PadRepairListInput.cs b/EquipMgr/Tnb.EquipMgr.Entities/Dto/PadRepairListInput.cs index 07e8c6a7..daf60528 100644 --- a/EquipMgr/Tnb.EquipMgr.Entities/Dto/PadRepairListInput.cs +++ b/EquipMgr/Tnb.EquipMgr.Entities/Dto/PadRepairListInput.cs @@ -1,6 +1,8 @@ +using JNPF.Common.Filter; + namespace Tnb.EquipMgr.Entities.Dto { - public class PadRepairListInput + public class PadRepairListInput : PageInputBase { public string status { get; set; } @@ -9,8 +11,5 @@ namespace Tnb.EquipMgr.Entities.Dto public DateTime? start_time { get; set; } public DateTime? end_time { get; set; } - public string sidx { get; set; } - public string sort { get; set; } - } } \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs index aecbaf0e..6a78f6c6 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs @@ -359,10 +359,9 @@ namespace Tnb.EquipMgr repairer_id_id = c.Id, remark = a.remark, status = f.FullName - }) - .ToListAsync(); + }).ToPagedListAsync((input?.currentPage ?? 1), (input?.pageSize ?? 50)); - return result; + return PageResult.SqlSugarPageResult(result); } } } \ No newline at end of file