From 59fdf00df32bcb445d280223d6a3691861a728d8 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Fri, 8 Nov 2024 16:32:33 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E6=9F=A5=E8=AF=A2=E6=B6=88=E8=B4=B9?= =?UTF-8?q?=E8=80=85=E5=8E=82=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Order/Request/BalanceRecordPageRequest.cs | 7 ++++++- .../Order/Services/Implements/BalanceService.cs | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs index 499949c0..e564d379 100644 --- a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs @@ -24,6 +24,11 @@ public class BalanceRecordPageRequest : PageDto, IValidatableObject /// public string Factory { get; set; } + /// + /// 消费者厂区 + /// + public string FromFactory { get; set; } + /// /// 日期范围查询 /// @@ -39,7 +44,7 @@ public class BalanceRecordPageRequest : PageDto, IValidatableObject /// 用户工号 /// public string UserCode { get; set; } - + /// /// 用户名称 /// diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index 24e9fb11..58252a3d 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -58,6 +58,7 @@ public class BalanceService : IBalanceService .WhereIF(request.ShiftTypes.IsPresent(), record => request.ShiftTypes.Contains(record.ShiftType)) .WhereIF(request.UserCode.IsPresent(), record => record.UserCode == request.UserCode) .WhereIF(request.UserName.IsPresent(), record => record.Name == request.UserName) + .WhereIF(request.FromFactory.IsPresent(), record => record.OriginTenantId == request.FromFactory) .OrderBy(record => record.CreateTime, OrderByType.Desc) .Select((record, department, bPlace, order) => new BalanceRecordResponse {