From bc94f9ed72887ad086aa403a8a3d4af19c96f29b Mon Sep 17 00:00:00 2001 From: liguoyang Date: Tue, 23 Dec 2025 09:41:41 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=A2=9E=E5=8A=A0=E5=8E=82=E5=8C=BA?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Voucher/Requests/VoucherBalancePageRequest.cs | 5 +++++ .../Voucher/Services/Implements/BirthdayVoucherService.cs | 1 + 2 files changed, 6 insertions(+) diff --git a/Src/Dlhis.Canteen/Voucher/Requests/VoucherBalancePageRequest.cs b/Src/Dlhis.Canteen/Voucher/Requests/VoucherBalancePageRequest.cs index ec84c447..4dacbbb1 100644 --- a/Src/Dlhis.Canteen/Voucher/Requests/VoucherBalancePageRequest.cs +++ b/Src/Dlhis.Canteen/Voucher/Requests/VoucherBalancePageRequest.cs @@ -16,4 +16,9 @@ public class VoucherBalancePageRequest : PageDto public string UserCode { get; set; } public DateTimePeriod SearchDateTimePeriod { get; set; } + + /// + /// 筛选厂区 + /// + public List Factories { get; set; } } diff --git a/Src/Dlhis.Canteen/Voucher/Services/Implements/BirthdayVoucherService.cs b/Src/Dlhis.Canteen/Voucher/Services/Implements/BirthdayVoucherService.cs index 7a5c121f..702cf56a 100644 --- a/Src/Dlhis.Canteen/Voucher/Services/Implements/BirthdayVoucherService.cs +++ b/Src/Dlhis.Canteen/Voucher/Services/Implements/BirthdayVoucherService.cs @@ -221,6 +221,7 @@ public class BirthdayVoucherService : BaseVoucherService, IVoucherService return await DbContext.Queryable() .LeftJoin((x, bPlace) => x.BusinessPlaceCode == bPlace.Code) .LeftJoin((x, bPlace, department) => x.DepartmentNo == department.No) + .WhereIF(request.Factories.IsPresent(), x => request.Factories.Contains(x.TenantId)) .WhereIF(request.UserCode.IsPresent(), x => x.UserCode == request.UserCode) .WhereIF(request.SearchDateTimePeriod.HasValue(), x => x.CostDate >= request.SearchDateTimePeriod.Start && x.CostDate <= request.SearchDateTimePeriod.End) //成本日期 .Where(x => x.Status == BalanceRecordStatusEnumType.Valid && x.Type == BalanceRecordTypeEnumType.Out) //有效,消费数据