admin/marco.pms.api
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Document_Manager #129

Merged
ashutosh.nehete merged 83 commits from Document_Manager into main 2025-09-11 04:12:01 +00:00
Conversation 0 Commits 83 Files Changed 73 +11 -5
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ecabf52f2f - Show all commits

16
Marco.Pms.Services/Helpers/EmployeeHelper.cs
View File

@ -4,6 +4,7 @@ using Marco.Pms.Model.Employees;
using Marco.Pms.Model.Mapper; using Marco.Pms.Model.Mapper;
using Marco.Pms.Model.ViewModels.Employee; using Marco.Pms.Model.ViewModels.Employee;
using MarcoBMS.Services.Service; using MarcoBMS.Services.Service;
using Microsoft.CodeAnalysis;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
namespace MarcoBMS.Services.Helpers namespace MarcoBMS.Services.Helpers
@ -78,12 +79,17 @@ namespace MarcoBMS.Services.Helpers
List<EmployeeVM> result = new List<EmployeeVM>(); List<EmployeeVM> result = new List<EmployeeVM>();
if (projectId.HasValue) if (projectId.HasValue)
{ {
var employeeIds = await _context.ProjectAllocations
.Where(pa => projectId == pa.ProjectId && pa.IsActive && pa.TenantId == tenantId)
.Select(pa => pa.EmployeeId)
.Distinct()
.ToListAsync();
result = await _context.ProjectAllocations result = await _context.Employees
.Include(pa => pa.Employee) .Include(fp => fp.JobRole)
.ThenInclude(e => e!.JobRole) .Where(e => employeeIds.Contains(e.Id) && e.IsActive && e.TenantId == tenantId)
.Where(pa => pa.ProjectId == projectId.Value && pa.IsActive && pa.Employee != null && pa.TenantId == tenantId) .Select(e => e.ToEmployeeVMFromEmployee())
.Select(pa => pa.Employee!.ToEmployeeVMFromEmployee()) .Distinct()
.ToListAsync(); .ToListAsync();
} }