From 56993da86b8b7f2f246ae962534dca2e1d7fd259 Mon Sep 17 00:00:00 2001 From: SamSys Date: Sun, 16 Mar 2025 21:08:03 +0330 Subject: [PATCH] fix conflict after marge from master --- .../RollCallEmployeeStatusApplication.cs | 1 + .../Repository/RollCallEmployeeRepository.cs | 6 ++---- ServiceHost/appsettings.Development.json | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs b/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs index 65e66394..faaaee3a 100644 --- a/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs +++ b/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs @@ -5,6 +5,7 @@ using Company.Domain.RollCallEmployeeStatusAgg; using CompanyManagment.App.Contracts.RollCallEmployeeStatus; using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using Company.Domain.RollCallServiceAgg; using Company.Domain.LeftWorkTempAgg; diff --git a/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs b/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs index 6b99658d..2f290277 100644 --- a/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs +++ b/CompanyManagment.EFCore/Repository/RollCallEmployeeRepository.cs @@ -101,12 +101,10 @@ public class RollCallEmployeeRepository : RepositoryBase ((employee, temp) => new { employee, temp })) .SelectMany(x => x.temp.DefaultIfEmpty(), (x, temp) => new { x.employee, temp }) - .Where(x => (x.employee.LeftWorks.Any(y => + .Where(x => x.employee.LeftWorks.Any(y => y.WorkshopId == command.WorkshopId && y.StartWorkDate <= dateNow && y.LeftWorkDate > dateNow || (y.WorkshopId == command.WorkshopId && y.StartWorkDate > dateNow)) || - x.employee.LeftWorkInsurances.Any(y => - y.WorkshopId == command.WorkshopId && y.StartWorkDate <= dateNow && - (y.LeftWorkDate > dateNow || y.LeftWorkDate == null))) || x.temp != null).OrderByDescending(x => x.employee.id) + x.temp != null).OrderByDescending(x => x.employee.id) .Select(x => new { Id = x.employee.id, diff --git a/ServiceHost/appsettings.Development.json b/ServiceHost/appsettings.Development.json index 13ca999d..82c8ebf5 100644 --- a/ServiceHost/appsettings.Development.json +++ b/ServiceHost/appsettings.Development.json @@ -15,11 +15,11 @@ //"MesbahDb": "Data Source=171.22.24.15;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]is[3019]#@ATt;TrustServerCertificate=true;" //local - //"MesbahDb": "Data Source=.;Initial Catalog=mesbah_db;Integrated Security=True;TrustServerCertificate=true;", + "MesbahDb": "Data Source=.;Initial Catalog=mesbah_db;Integrated Security=True;TrustServerCertificate=true;" //dad-mehr - "MesbahDb": "Data Source=.;Initial Catalog=teamWork;Integrated Security=True;TrustServerCertificate=true;" + // "MesbahDb": "Data Source=.;Initial Catalog=teamWork;Integrated Security=True;TrustServerCertificate=true;" }, "GoogleRecaptchaV3": { "SiteKey": "6Lfhp_AnAAAAAB79WkrMoHd1k8ir4m8VvfjE7FTH",