From b8f8485266f72ec14ea73dc7588a1f09ed61be0f Mon Sep 17 00:00:00 2001 From: SamSys Date: Wed, 12 Mar 2025 23:41:30 +0330 Subject: [PATCH] comment status for middle month aval mah kon --- .../RollCallEmployeeStatusApplication.cs | 10 +++++----- .../Repository/RollCallEmployeeRepository.cs | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs b/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs index 33621db8..1c98736e 100644 --- a/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs +++ b/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs @@ -59,11 +59,11 @@ namespace CompanyManagment.Application if(leftWork.StartWorkDate>DateTime.Today) startStatus = leftWork.StartWorkDate; - else if(pc.GetMonth(DateTime.Today) == pc.GetMonth(leftWork.StartWorkDate)) - { - startStatus = new DateTime(pc.GetYear(leftWork.StartWorkDate), pc.GetMonth(leftWork.StartWorkDate), - 1, pc); - } + //else if(pc.GetMonth(DateTime.Today) == pc.GetMonth(leftWork.StartWorkDate)) + //{ + // startStatus = new DateTime(pc.GetYear(leftWork.StartWorkDate), pc.GetMonth(leftWork.StartWorkDate), + // 1, pc); + //} RollCallEmployeeStatus newRecord = new(rollCallEmployee.id, startStatus); _employeeRollCallStatusRepository.Create(newRecord); diff --git a/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs b/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs index eb736e7d..6df6274a 100644 --- a/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs +++ b/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs @@ -96,8 +96,8 @@ public class RollCallEmployeeRepository : RepositoryBase var rawQuery = employeeQuery.Include(x => x.LeftWorks).Include(x => x.LeftWorkInsurances) .Where(x => x.LeftWorks.Any(y => - y.WorkshopId == command.WorkshopId && y.StartWorkDate <= dateNow && - y.LeftWorkDate > dateNow) || + (y.WorkshopId == command.WorkshopId && y.StartWorkDate <= dateNow && + y.LeftWorkDate > dateNow) || y.StartWorkDate>dateNow) || x.LeftWorkInsurances.Any(y => y.WorkshopId == command.WorkshopId && y.StartWorkDate <= dateNow && (y.LeftWorkDate > dateNow || y.LeftWorkDate == null))).OrderByDescending(x => x.id)