diff --git a/Company.Domain/RollCallAgg/IRollCallRepository.cs b/Company.Domain/RollCallAgg/IRollCallRepository.cs index 4afc1f6a..9d05d620 100644 --- a/Company.Domain/RollCallAgg/IRollCallRepository.cs +++ b/Company.Domain/RollCallAgg/IRollCallRepository.cs @@ -94,7 +94,7 @@ namespace Company.Domain.RollCallAgg #endregion Task> GetCaseHistoryTitles(long workshopId,RollCallCaseHistorySearchModel searchModel); - Task> GetCaseHistoryDetails(long workshopId, + Task> GetCaseHistoryDetails(long workshopId, string titleId, RollCallCaseHistorySearchModel searchModel); } } diff --git a/CompanyManagment.App.Contracts/RollCall/IRollCallApplication.cs b/CompanyManagment.App.Contracts/RollCall/IRollCallApplication.cs index 0a717f0d..bdff1e85 100644 --- a/CompanyManagment.App.Contracts/RollCall/IRollCallApplication.cs +++ b/CompanyManagment.App.Contracts/RollCall/IRollCallApplication.cs @@ -129,7 +129,8 @@ namespace CompanyManagment.App.Contracts.RollCall Task RecalculateValues(long workshopId, List command); Task> GetCaseHistoryTitles(long workshopId,RollCallCaseHistorySearchModel searchModel); - Task> GetCaseHistoryDetails(long workshopId, string titleId, RollCallCaseHistorySearchModel searchModel); + Task> GetCaseHistoryDetails(long workshopId, string titleId, + RollCallCaseHistorySearchModel searchModel); } public class RollCallCaseHistoryDetail diff --git a/CompanyManagment.Application/RollCallApplication.cs b/CompanyManagment.Application/RollCallApplication.cs index 96594dc8..7f145407 100644 --- a/CompanyManagment.Application/RollCallApplication.cs +++ b/CompanyManagment.Application/RollCallApplication.cs @@ -864,7 +864,7 @@ public class RollCallApplication : IRollCallApplication return await _rollCallRepository.GetCaseHistoryTitles(workshopId,searchModel); } - public async Task> GetCaseHistoryDetails(long workshopId, + public async Task> GetCaseHistoryDetails(long workshopId, string titleId, RollCallCaseHistorySearchModel searchModel) { return await _rollCallRepository.GetCaseHistoryDetails(workshopId, titleId, searchModel); diff --git a/CompanyManagment.EFCore/Repository/RollCallRepository.cs b/CompanyManagment.EFCore/Repository/RollCallRepository.cs index eb09e73a..eb5e40f7 100644 --- a/CompanyManagment.EFCore/Repository/RollCallRepository.cs +++ b/CompanyManagment.EFCore/Repository/RollCallRepository.cs @@ -2285,7 +2285,7 @@ public class RollCallRepository : RepositoryBase, IRollCallRepos return res; } - public async Task> GetCaseHistoryDetails(long workshopId, string titleId, + public async Task> GetCaseHistoryDetails(long workshopId, string titleId, RollCallCaseHistorySearchModel searchModel) { var query = _context.RollCallEmployeesStatus @@ -2344,7 +2344,7 @@ public class RollCallRepository : RepositoryBase, IRollCallRepos .Where(x => x.WorkshopId == workshopId && employeeIds.Contains(x.EmployeeId)).ToListAsync(); - var res = new PagedResult(); + var res = new List(); foreach (var date in dates) { var rollCallInDate = rollCalls @@ -2379,12 +2379,10 @@ public class RollCallRepository : RepositoryBase, IRollCallRepos PersonnelCode = personnelCodes.FirstOrDefault(y => y.EmployeeId == employeeId)?.PersonnelCode .ToString(), }; - res.List.Add(item); + res.Add(item); } } return res; - - return new PagedResult(); } } \ No newline at end of file diff --git a/ServiceHost/Areas/Client/Controllers/RollCall/CaseHistoryController.cs b/ServiceHost/Areas/Client/Controllers/RollCall/CaseHistoryController.cs index 5dea4b3f..9ad0ee58 100644 --- a/ServiceHost/Areas/Client/Controllers/RollCall/CaseHistoryController.cs +++ b/ServiceHost/Areas/Client/Controllers/RollCall/CaseHistoryController.cs @@ -25,7 +25,7 @@ public class CaseHistoryController : ClientBaseController } [HttpGet("details")] - public async Task>> GetDetails(string titleId, + public async Task>> GetDetails(string titleId, RollCallCaseHistorySearchModel searchModel) { return await _rollCallApplication.GetCaseHistoryDetails(_workshopId, titleId, searchModel); @@ -42,6 +42,10 @@ public class CaseHistoryController : ClientBaseController command.WorkshopId = _workshopId; return _rollCallApplication.ManualEdit(command); } + + // [HttpGet("print")] + // public ActionResult<> + // [HttpGet("edit")] // public ActionResult<> GetEditDetails(string date,long employeeId)