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

Merge branch 'Feature/roll-call/current-day-api' into Main

Browse Source
This commit is contained in:
mahan
2025-10-29 11:09:53 +03:30
parent e612150f1d c10ae17f8c
commit d0fa1b2f58
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,7 +129,7 @@ namespace CompanyManagment.App.Contracts.RollCall
public class WorkshopCurrentDayRollCallSearchModel
{
public long WorkshopId { get; set; }
public long EmployeeId { get; set; }
public int PersonnelCode { get; set; }
}

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

@@ -1088,12 +1088,12 @@ public class RollCallRepository : RepositoryBase<long, RollCall>, IRollCallRepos
x.WorkshopId == workshopId && (x.ShiftDate.Date == date || x.EndDate == null) && x.RollCallModifyType != RollCallModifyType.Undefined);
if (searchModel.WorkshopId>0)
if (searchModel.EmployeeId>0)
{
leaves = leaves.Where(x=>x.WorkshopId == searchModel.WorkshopId);
personnelCodes = personnelCodes.Where(x=>x.WorkshopId == searchModel.WorkshopId);
activeEmployees = activeEmployees.Where(x=>x.WorkshopId == searchModel.WorkshopId);
rollCallsQuery = rollCallsQuery.Where(x=>x.WorkshopId == searchModel.WorkshopId);
leaves = leaves.Where(x=>x.WorkshopId == searchModel.EmployeeId);
personnelCodes = personnelCodes.Where(x=>x.EmployeeId == searchModel.EmployeeId);
activeEmployees = activeEmployees.Where(x=>x.EmployeeId == searchModel.EmployeeId);
rollCallsQuery = rollCallsQuery.Where(x=>x.EmployeeId == searchModel.EmployeeId);
}