Marselchii/PIbd-21_Sagirov_M.M._Malafeev_L.S._CourseWork_CarCenter
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Добавленны поля для поиска по периоду в модель покупки

Browse Source
This commit is contained in:
Marselchi 2024-04-30 22:42:35 +04:00
parent 035fccc42c
commit f129c4d785
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CarCenter/CarCenterContracts/SearchModels/OrderSearchModel.cs
View File

@ -1,4 +1,5 @@
using System;
using CarCenterDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@ -9,5 +10,8 @@ namespace CarCenterContracts.SearchModels
public class OrderSearchModel
{
public int? Id { get; set; }
}
public List<IPresaleModel> Presales { get; set; } = new();
public DateTime? DateFrom { get; set; }
public DateTime? DateTo { get; set; }
}
}

30
CarCenter/CarCenterDatabaseImplement/Implements/OrderStorage.cs
View File

@ -54,7 +54,35 @@ namespace CarCenterDatabaseImplement.Implements
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
using var context = new CarCenterDatabase();
if (model.Id.HasValue)
if (model.DateFrom.HasValue && model.DateTo.HasValue) //для отчета
{
return context.Orders
.Include(x => x.Worker)
.Include(x => x.Cars)
.Include(x => x.Presales)
.ThenInclude(x => x.Presale)
.ThenInclude(x => x.Requests)
.Include(x => x.Presales)
.ThenInclude(x => x.Presale)
.ThenInclude(x => x.Bundlings)
.ThenInclude(x => x.Bundling)
.Where(x => x.PaymentDate >= model.DateFrom && x.PaymentDate <= model.DateTo)
.Select(x => x.GetViewModel)
.ToList();
}
else if (model.Presales.Count > 0) //для отчета
{
return context.Orders
.Include(x => x.Worker)
.Include(x => x.Cars)
.Include(x => x.Presales)
.ThenInclude(x => x.Presale)
.Where(x => x.OrderPresales.Any(p => model.Presales.Any(presale => p.Value == presale)))
.Select(x => x.GetViewModel)
.ToList();
}
else if (model.Id.HasValue)
{
return context.Orders
.Include(x => x.Worker)