admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change paginated to list

Browse Source
This commit is contained in:
mahan
2026-01-13 18:31:10 +03:30
parent 8850328fd4
commit d179c90c48
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Company.Domain/RollCallAgg/IRollCallRepository.cs
View File

@@ -94,7 +94,7 @@ namespace Company.Domain.RollCallAgg
#endregion
Task<PagedResult<RollCallCaseHistoryTitleDto>> GetCaseHistoryTitles(long workshopId,RollCallCaseHistorySearchModel searchModel);
Task<PagedResult<RollCallCaseHistoryDetail>> GetCaseHistoryDetails(long workshopId,
Task<List<RollCallCaseHistoryDetail>> GetCaseHistoryDetails(long workshopId,
string titleId, RollCallCaseHistorySearchModel searchModel);
}
}

3
CompanyManagment.App.Contracts/RollCall/IRollCallApplication.cs
View File

@@ -129,7 +129,8 @@ namespace CompanyManagment.App.Contracts.RollCall
Task<OperationResult> RecalculateValues(long workshopId, List<ReCalculateRollCallValues> command);
Task<PagedResult<RollCallCaseHistoryTitleDto>> GetCaseHistoryTitles(long workshopId,RollCallCaseHistorySearchModel searchModel);
Task<PagedResult<RollCallCaseHistoryDetail>> GetCaseHistoryDetails(long workshopId, string titleId, RollCallCaseHistorySearchModel searchModel);
Task<List<RollCallCaseHistoryDetail>> GetCaseHistoryDetails(long workshopId, string titleId,
RollCallCaseHistorySearchModel searchModel);
}
public class RollCallCaseHistoryDetail

2
CompanyManagment.Application/RollCallApplication.cs
View File

@@ -864,7 +864,7 @@ public class RollCallApplication : IRollCallApplication
return await _rollCallRepository.GetCaseHistoryTitles(workshopId,searchModel);
}
public async Task<PagedResult<RollCallCaseHistoryDetail>> GetCaseHistoryDetails(long workshopId,
public async Task<List<RollCallCaseHistoryDetail>> GetCaseHistoryDetails(long workshopId,
string titleId, RollCallCaseHistorySearchModel searchModel)
{
return await _rollCallRepository.GetCaseHistoryDetails(workshopId, titleId, searchModel);

8
CompanyManagment.EFCore/Repository/RollCallRepository.cs
View File

@@ -2285,7 +2285,7 @@ public class RollCallRepository : RepositoryBase<long, RollCall>, IRollCallRepos
return res;
}
public async Task<PagedResult<RollCallCaseHistoryDetail>> GetCaseHistoryDetails(long workshopId, string titleId,
public async Task<List<RollCallCaseHistoryDetail>> GetCaseHistoryDetails(long workshopId, string titleId,
RollCallCaseHistorySearchModel searchModel)
{
var query = _context.RollCallEmployeesStatus
@@ -2344,7 +2344,7 @@ public class RollCallRepository : RepositoryBase<long, RollCall>, IRollCallRepos
.Where(x => x.WorkshopId == workshopId
&& employeeIds.Contains(x.EmployeeId)).ToListAsync();
var res = new PagedResult<RollCallCaseHistoryDetail>();
var res = new List<RollCallCaseHistoryDetail>();
foreach (var date in dates)
{
var rollCallInDate = rollCalls
@@ -2379,12 +2379,10 @@ public class RollCallRepository : RepositoryBase<long, RollCall>, IRollCallRepos
PersonnelCode = personnelCodes.FirstOrDefault(y => y.EmployeeId == employeeId)?.PersonnelCode
.ToString(),
};
res.List.Add(item);
res.Add(item);
}
}
return res;
return new PagedResult<RollCallCaseHistoryDetail>();
}
}

6
ServiceHost/Areas/Client/Controllers/RollCall/CaseHistoryController.cs
View File

@@ -25,7 +25,7 @@ public class CaseHistoryController : ClientBaseController
}
[HttpGet("details")]
public async Task<ActionResult<PagedResult<RollCallCaseHistoryDetail>>> GetDetails(string titleId,
public async Task<ActionResult<List<RollCallCaseHistoryDetail>>> 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)