diff --git a/Marco.Pms.Helpers/CacheHelper/ExpenseCache.cs b/Marco.Pms.Helpers/CacheHelper/ExpenseCache.cs index fc670d6..5bdc934 100644 --- a/Marco.Pms.Helpers/CacheHelper/ExpenseCache.cs +++ b/Marco.Pms.Helpers/CacheHelper/ExpenseCache.cs @@ -52,12 +52,18 @@ namespace Marco.Pms.Helpers.CacheHelper if (expenseFilter != null) { - if (expenseFilter.StartDate.HasValue && expenseFilter.EndDate.HasValue) + if (expenseFilter.StartDate.HasValue && expenseFilter.EndDate.HasValue && expenseFilter.IsTransactionDate == false) { filter &= filterBuilder.Gte(e => e.CreatedAt, expenseFilter.StartDate.Value.Date) & filterBuilder.Lte(e => e.CreatedAt, expenseFilter.EndDate.Value.Date.AddDays(1).AddTicks(-1)); } + if (expenseFilter.StartDate.HasValue && expenseFilter.EndDate.HasValue && expenseFilter.IsTransactionDate) + { + filter &= filterBuilder.Gte(e => e.TransactionDate, expenseFilter.StartDate.Value.Date) + & filterBuilder.Lte(e => e.TransactionDate, expenseFilter.EndDate.Value.Date.AddDays(1).AddTicks(-1)); + } + if (expenseFilter.ProjectIds?.Any() == true) { filter &= filterBuilder.In(e => e.Project.Id, expenseFilter.ProjectIds.Select(p => p.ToString()).ToList());