From 4ed1907075a35d76fb4e7b07d9213f9224028080 Mon Sep 17 00:00:00 2001 From: mahan Date: Mon, 29 Dec 2025 16:42:44 +0330 Subject: [PATCH] feat: add GetWorkingEmployeesSelectList method and update controller to use it --- Company.Domain/EmployeeAgg/IEmployeeRepository.cs | 8 ++++++++ .../Employee/IEmployeeApplication.cs | 6 +++++- CompanyManagment.Application/EmployeeAplication.cs | 5 +++++ .../Areas/Client/Controllers/EmployeeController.cs | 4 +++- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/Company.Domain/EmployeeAgg/IEmployeeRepository.cs b/Company.Domain/EmployeeAgg/IEmployeeRepository.cs index b61bf8f4..5bf23937 100644 --- a/Company.Domain/EmployeeAgg/IEmployeeRepository.cs +++ b/Company.Domain/EmployeeAgg/IEmployeeRepository.cs @@ -54,6 +54,7 @@ public interface IEmployeeRepository : IRepository Employee GetIgnoreQueryFilter(long id); + [Obsolete("این متد منسوخ شده است و از متد WorkedEmployeesInWorkshopSelectList استفاده کنید")] Task> WorkedEmployeesInWorkshopSelectList(long workshopId); @@ -95,6 +96,13 @@ public interface IEmployeeRepository : IRepository /// Task> PrintAllEmployeesInfoClient(long workshopId); + /// + /// سلکت لیست پرسنل های کارگاه کلاینت + /// + /// + /// + Task> GetWorkingEmployeesSelectList(long workshopId); + #endregion diff --git a/CompanyManagment.App.Contracts/Employee/IEmployeeApplication.cs b/CompanyManagment.App.Contracts/Employee/IEmployeeApplication.cs index aaba14db..5ea7e80e 100644 --- a/CompanyManagment.App.Contracts/Employee/IEmployeeApplication.cs +++ b/CompanyManagment.App.Contracts/Employee/IEmployeeApplication.cs @@ -1,8 +1,10 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Threading.Tasks; using _0_Framework.Application; using CompanyManagment.App.Contracts.Employee.DTO; using CompanyManagment.App.Contracts.EmployeeInsuranceRecord; +using Microsoft.AspNetCore.Mvc; namespace CompanyManagment.App.Contracts.Employee; @@ -73,6 +75,7 @@ public interface IEmployeeApplication long workshopId); Task EditEmployeeInEmployeeDocumentWorkFlow(EditEmployeeInEmployeeDocument command); + [Obsolete("این متد منسوخ شده است و از متد WorkedEmployeesInWorkshopSelectList استفاده کنید")] Task> WorkedEmployeesInWorkshopSelectList(long workshopId); Task> GetEmployeeDataFromApi(string nationalCode, string birthDate); @@ -122,6 +125,7 @@ public interface IEmployeeApplication Task> PrintAllEmployeesInfoClient(long workshopId); #endregion + Task> GetWorkingEmployeesSelectList(long workshopId); } public class GetClientEmployeeListSearchModel diff --git a/CompanyManagment.Application/EmployeeAplication.cs b/CompanyManagment.Application/EmployeeAplication.cs index 9d8aa4f4..fdf7e950 100644 --- a/CompanyManagment.Application/EmployeeAplication.cs +++ b/CompanyManagment.Application/EmployeeAplication.cs @@ -1744,5 +1744,10 @@ public class EmployeeAplication : RepositoryBase, IEmployeeAppli return await _EmployeeRepository.PrintAllEmployeesInfoClient(workshopId); } + public async Task> GetWorkingEmployeesSelectList(long workshopId) + { + return await _EmployeeRepository.GetWorkingEmployeesSelectList(workshopId); + } + #endregion } \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Controllers/EmployeeController.cs b/ServiceHost/Areas/Client/Controllers/EmployeeController.cs index d3136348..5218a7a8 100644 --- a/ServiceHost/Areas/Client/Controllers/EmployeeController.cs +++ b/ServiceHost/Areas/Client/Controllers/EmployeeController.cs @@ -17,14 +17,16 @@ public class EmployeeController:ClientBaseController _workshopId = authHelper.GetWorkshopId(); } + [HttpGet("select-list")] public async Task>> GetEmployeeSelectList() { - var result = await _employeeApplication.WorkedEmployeesInWorkshopSelectList(_workshopId); + var result = await _employeeApplication.GetWorkingEmployeesSelectList(_workshopId); return result; } + /// /// دریافت لیست پرسنل ///