diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Controller/MealSupplementsRecordController.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Controller/MealSupplementsRecordController.cs index 2644e477..173cff3b 100644 --- a/Src/Dlhis.Canteen/MealSupplementRecord/Controller/MealSupplementsRecordController.cs +++ b/Src/Dlhis.Canteen/MealSupplementRecord/Controller/MealSupplementsRecordController.cs @@ -27,6 +27,7 @@ public class MealSupplementsRecordController /// /// /// + [Authorize(Roles = "admin,tenant-admin")] [HttpGet("page")] public async Task> MealSupplementRecordPageAsync([FromQuery] MealSupplementRecordRequest request) { diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Request/MealSupplementRecordRequest.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Request/MealSupplementRecordRequest.cs index c93f2bb1..53df63c5 100644 --- a/Src/Dlhis.Canteen/MealSupplementRecord/Request/MealSupplementRecordRequest.cs +++ b/Src/Dlhis.Canteen/MealSupplementRecord/Request/MealSupplementRecordRequest.cs @@ -18,6 +18,17 @@ public class MealSupplementRecordRequest : PageDto, IValidatableObject /// public bool? Sync { get; set; } + /// + /// 工作地 + /// + public string Workplace { get; set; } + + /// + /// 厂区 + /// + public string Factory { get; set; } + + /// /// 餐补日期范围 /// diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs index 121d47e3..1cb3ec82 100644 --- a/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs +++ b/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs @@ -33,6 +33,8 @@ public class MealSupplementRecordService : IMealSupplementRecordService .LeftJoin((x, ga) => x.Code == ga.Code) .WhereIF(request.Status.HasValue, x => x.Status == request.Status) .WhereIF(request.Sync.HasValue, x => x.Sync == request.Sync) + .WhereIF(request.Workplace.IsPresent(), x => x.Workplace == request.Workplace) + .WhereIF(request.Factory.IsPresent(), x => x.Factory == request.Factory) .WhereIF(request.DateTimePeriod?.Start.HasValue == true && request.DateTimePeriod?.End.HasValue == true, x => x.Date >= request.DateTimePeriod.Start && x.Date <= request.DateTimePeriod.End)