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 {