LivelyPuer/Check
1
0
Fork 0
forked from slavaxom9k/PIBD-23_Fomichev_V.S._MagicCarpet
Code Pull Requests Activity

правки

Browse Source
This commit is contained in:
xom9k
2025-02-27 09:12:07 +04:00
parent 18df50575b
commit c12efe7f92
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MagicCarpetProject/MagicCarpetDatabase/Implementations/EmployeeStorageContract.cs
View File

@@ -27,7 +27,7 @@ internal class EmployeeStorageContract : IEmployeeStorageContract
_mapper = new Mapper(config); _mapper = new Mapper(config);
} }
public List<EmployeeDataModel> GetList(bool onlyActive = true, string? postId = null, DateTime? fromBirthDate = null, DateTime? toBirthDate = null, public List<EmployeeDataModel> GetList(bool onlyActive = true, string? email = null, DateTime? fromBirthDate = null, DateTime? toBirthDate = null,
DateTime? fromEmploymentDate = null, DateTime? toEmploymentDate = null) DateTime? fromEmploymentDate = null, DateTime? toEmploymentDate = null)
{ {
try try
@@ -37,9 +37,9 @@ internal class EmployeeStorageContract : IEmployeeStorageContract
{ {
query = query.Where(x => !x.IsDeleted); query = query.Where(x => !x.IsDeleted);
} }
if (postId is not null) if (email is not null)
{ {
query = query.Where(x => x.PostId == postId); query = query.Where(x => x.PostId == email);
} }
if (fromBirthDate is not null && toBirthDate is not null) if (fromBirthDate is not null && toBirthDate is not null)
{ {

4
MagicCarpetProject/MagicCarpetDatabase/Models/Employee.cs
View File

@@ -13,10 +13,10 @@ internal class Employee
public required string FIO { get; set; } public required string FIO { get; set; }
public string Email { get; set; }
public required string PostId { get; set; } public required string PostId { get; set; }
public string? Email { get; set; }
public DateTime BirthDate { get; set; } public DateTime BirthDate { get; set; }
public DateTime EmploymentDate { get; set; } public DateTime EmploymentDate { get; set; }

2
MagicCarpetProject/MagicCarpetDatabase/Models/Salary.cs
View File

@@ -8,7 +8,7 @@ namespace MagicCarpetDatabase.Models;
internal class Salary internal class Salary
{ {
public required string Id { get; set; } = Guid.NewGuid().ToString(); public string Id { get; set; } = Guid.NewGuid().ToString();
public required string EmployeeId { get; set; } public required string EmployeeId { get; set; }
public DateTime SalaryDate { get; set; } public DateTime SalaryDate { get; set; }
public double EmployeeSalary { get; set; } public double EmployeeSalary { get; set; }

4
MagicCarpetProject/MagicCarpetDatabase/Models/Sale.cs
View File

@@ -11,14 +11,14 @@ namespace MagicCarpetDatabase.Models;
internal class Sale internal class Sale
{ {
public required string Id { get; set; } public string Id { get; set; } = Guid.NewGuid().ToString();
public required string EmployeeId { get; set; } public required string EmployeeId { get; set; }
public string? ClientId { get; set; } public string? ClientId { get; set; }
public DateTime SaleDate { get; set; } public DateTime SaleDate { get; set; }
public double Sum { get; private set; } public double Sum { get; set; }
public DiscountType DiscountType { get; set; } public DiscountType DiscountType { get; set; }