Fix Conflict

This commit is contained in:
SamSys
2025-06-03 21:44:00 +03:30
parent 0c0e955800
commit 9b455d4a2e

View File

@@ -65,20 +65,26 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
private readonly ILeftWorkInsuranceRepository _leftWorkInsuranceRepository ; private readonly ILeftWorkInsuranceRepository _leftWorkInsuranceRepository ;
private readonly IRollCallServiceRepository _rollCallServiceRepository; private readonly IRollCallServiceRepository _rollCallServiceRepository;
public EmployeeAplication(IEmployeeRepository employeeRepository, CompanyContext context, IWorkshopRepository workShopRepository, public EmployeeAplication(IEmployeeRepository employeeRepository, CompanyContext context,
IWorkshopRepository workShopRepository,
ILeftWorkRepository leftWorkRepository, IPersonnelCodeRepository personnelCodeRepository, ILeftWorkRepository leftWorkRepository, IPersonnelCodeRepository personnelCodeRepository,
IEmployeeClientTempRepository employeeClientTempRepository, IWebHostEnvironment webHostEnvironment, IEmployeeClientTempRepository employeeClientTempRepository, IWebHostEnvironment webHostEnvironment,
IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication, IRollCallEmployeeRepository rollCallEmployeeRepository, IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication,
IRollCallEmployeeRepository rollCallEmployeeRepository,
ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository, ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository,
ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication, IEmployeeDocumentsApplication employeeDocumentsApplication, ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication,
IEmployeeBankInformationApplication employeeBankInformationApplication, ILeftWorkTempRepository leftWorkTempRepository, IEmployeeDocumentsApplication employeeDocumentsApplication,
IUidService uidService, ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository, IEmployeeBankInformationApplication employeeBankInformationApplication,
IEmployeeAuthorizeTempRepository employeeAuthorizeTempRepository, IRollCallServiceRepository rollCallServiceRepository) : base(context) ILeftWorkTempRepository leftWorkTempRepository,
IUidService uidService,
ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository,
IEmployeeAuthorizeTempRepository employeeAuthorizeTempRepository,
IRollCallServiceRepository rollCallServiceRepository, ILeftWorkInsuranceRepository leftWorkInsuranceRepository) : base(context)
{ {
_context = context; _context = context;
_WorkShopRepository = workShopRepository; _WorkShopRepository = workShopRepository;
_EmployeeRepository = employeeRepository; _EmployeeRepository = employeeRepository;
this._leftWorkRepository = leftWorkRepository; this._leftWorkRepository = leftWorkRepository;
_personnelCodeRepository = personnelCodeRepository; _personnelCodeRepository = personnelCodeRepository;
_employeeClientTempRepository = employeeClientTempRepository; _employeeClientTempRepository = employeeClientTempRepository;
_webHostEnvironment = webHostEnvironment; _webHostEnvironment = webHostEnvironment;