diff --git a/Company.Domain/WorkshopAgg/IWorkshopRepository.cs b/Company.Domain/WorkshopAgg/IWorkshopRepository.cs index ac14d666..e95f2128 100644 --- a/Company.Domain/WorkshopAgg/IWorkshopRepository.cs +++ b/Company.Domain/WorkshopAgg/IWorkshopRepository.cs @@ -69,7 +69,7 @@ public interface IWorkshopRepository : IRepository Task GetWorkshopsForEmployeeStartWorkCount(long accountId); Task> GetWorkshopsForLeftWorkTemp(long accountId); Task GetWorkshopsForLeftWorkTempCount(long accountId); - Task> GetSelectList(string search); + Task> GetSelectList(string search,long id); #endregion diff --git a/CompanyManagment.App.Contracts/Workshop/IWorkshopApplication.cs b/CompanyManagment.App.Contracts/Workshop/IWorkshopApplication.cs index d1eee693..fc437ad4 100644 --- a/CompanyManagment.App.Contracts/Workshop/IWorkshopApplication.cs +++ b/CompanyManagment.App.Contracts/Workshop/IWorkshopApplication.cs @@ -85,7 +85,7 @@ public interface IWorkshopApplication Task> GetWorkshopsForLeftWorkTemp(long accountId); Task GetWorkshopsForLeftWorkTempCount(long accountId); - Task> GetSelectList(string search); + Task> GetSelectList(string search, long id); #endregion diff --git a/CompanyManagment.Application/WorkshopAppliction.cs b/CompanyManagment.Application/WorkshopAppliction.cs index 60a83e12..5562e3ee 100644 --- a/CompanyManagment.Application/WorkshopAppliction.cs +++ b/CompanyManagment.Application/WorkshopAppliction.cs @@ -920,9 +920,9 @@ public class WorkshopAppliction : IWorkshopApplication return _workshopRepository.GetWorkshopsForLeftWorkTempCount(accountId); } - public async Task> GetSelectList(string search) + public async Task> GetSelectList(string search, long id = 0) { - return await _workshopRepository.GetSelectList(search); + return await _workshopRepository.GetSelectList(search, id); } #endregion diff --git a/CompanyManagment.EFCore/Repository/WorkshopRepository.cs b/CompanyManagment.EFCore/Repository/WorkshopRepository.cs index 4fd6736e..22bf35b4 100644 --- a/CompanyManagment.EFCore/Repository/WorkshopRepository.cs +++ b/CompanyManagment.EFCore/Repository/WorkshopRepository.cs @@ -1155,7 +1155,7 @@ public class WorkshopRepository : RepositoryBase> GetSelectList(string search) + public async Task> GetSelectList(string search,long id) { var query = _context.Workshops.Select(x => new WorkshopSelectListViewModel() { @@ -1167,6 +1167,10 @@ public class WorkshopRepository : RepositoryBase x.Name.Contains(search)); } + if (id > 0) + { + query = query.Where(x => x.Id == id); + } return await query.Take(100).ToListAsync(); } diff --git a/ServiceHost/Areas/Admin/Controllers/WorkshopController.cs b/ServiceHost/Areas/Admin/Controllers/WorkshopController.cs index 3aee5741..90595715 100644 --- a/ServiceHost/Areas/Admin/Controllers/WorkshopController.cs +++ b/ServiceHost/Areas/Admin/Controllers/WorkshopController.cs @@ -19,9 +19,9 @@ public class WorkshopController: AdminBaseController /// /// [HttpGet("select_list")] - public async Task>> GetSelectList(string search) + public async Task>> GetSelectList(string search, long id) { - var data = await _workshopApplication.GetSelectList(search); + var data = await _workshopApplication.GetSelectList(search,id); return data; } diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/MonthlyOverview/Index.cshtml.cs b/ServiceHost/Areas/AdminNew/Pages/Company/MonthlyOverview/Index.cshtml.cs index 7e9d5ee9..7fe5c0a0 100644 --- a/ServiceHost/Areas/AdminNew/Pages/Company/MonthlyOverview/Index.cshtml.cs +++ b/ServiceHost/Areas/AdminNew/Pages/Company/MonthlyOverview/Index.cshtml.cs @@ -95,9 +95,9 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.MonthlyOverview data = res }); } - public async Task OnGetWorkshopSelectList(string search) + public async Task OnGetWorkshopSelectList(string search, long id) { - var res = await _workshopApplication.GetSelectList(search); + var res = await _workshopApplication.GetSelectList(search, id); return new JsonResult(new { data = res