แก้ออกคำสั่ง
This commit is contained in:
parent
ad70e8164c
commit
564a23988d
17 changed files with 77109 additions and 252 deletions
|
|
@ -2981,37 +2981,8 @@ namespace BMA.EHR.Application.Repositories.Commands
|
|||
var placementProfile = await _dbContext.Set<PlacementProfile>()
|
||||
.Include(x => x.PlacementProfileDocs)
|
||||
.ThenInclude(x => x.Document)
|
||||
.Include(x => x.PositionPath)
|
||||
.Include(x => x.PositionPathSide)
|
||||
.Include(x => x.PositionType)
|
||||
.Include(x => x.PositionLine)
|
||||
.Include(x => x.PositionLevel)
|
||||
.Include(x => x.PositionNumber)
|
||||
|
||||
.Include(x => x.PlacementCertificates)
|
||||
.Include(x => x.PlacementEducations)
|
||||
.ThenInclude(x => x.EducationLevel)
|
||||
|
||||
.Include(x => x.OrganizationPosition)
|
||||
.ThenInclude(x => x.Organization)
|
||||
.ThenInclude(x => x.OrganizationShortName)
|
||||
|
||||
.Include(x => x.OrganizationPosition)
|
||||
.ThenInclude(x => x.PositionMaster)
|
||||
.ThenInclude(x => x.PositionExecutive)
|
||||
|
||||
.Include(x => x.OrganizationPosition)
|
||||
.ThenInclude(x => x.PositionMaster)
|
||||
.ThenInclude(x => x.PositionExecutiveSide)
|
||||
|
||||
.Include(x => x.OrganizationPosition)
|
||||
.ThenInclude(x => x.PositionMaster)
|
||||
.ThenInclude(x => x.PositionLine)
|
||||
|
||||
.Include(x => x.OrganizationPosition)
|
||||
.ThenInclude(x => x.Organization)
|
||||
.ThenInclude(x => x.OrganizationOrganization)
|
||||
|
||||
.FirstOrDefaultAsync(x => x.Id == recv.RefPlacementProfileId);
|
||||
|
||||
if (placementProfile == null)
|
||||
|
|
@ -3093,7 +3064,7 @@ namespace BMA.EHR.Application.Repositories.Commands
|
|||
other = edu.Other == null ? string.Empty : edu.Other,
|
||||
startDate = edu.StartDate == null ? (DateTime?)null : edu.StartDate,
|
||||
endDate = edu.EndDate == null ? (DateTime?)null : edu.EndDate,
|
||||
educationLevel = edu.EducationLevel == null ? string.Empty : edu.EducationLevel.Name,
|
||||
educationLevel = edu.EducationLevelName,
|
||||
educationLevelId = string.Empty,
|
||||
positionPath = edu.PositionPath == null ? null : edu.PositionPath,
|
||||
positionPathId = string.Empty,
|
||||
|
|
@ -10162,13 +10133,12 @@ namespace BMA.EHR.Application.Repositories.Commands
|
|||
var data = await (from r in _dbContext.Set<CommandReceiver>()
|
||||
.Include(x => x.Command)
|
||||
join pf in _dbContext.Set<PlacementProfile>()
|
||||
.Include(x => x.PositionPath)
|
||||
on r.RefPlacementProfileId equals pf.Id
|
||||
where r.Command.Id == id
|
||||
select new
|
||||
{
|
||||
r.RefPlacementProfileId,
|
||||
Position = pf.PositionPath!.Name
|
||||
Position = pf.positionName
|
||||
}).ToListAsync();
|
||||
|
||||
if (data.Count > 0)
|
||||
|
|
@ -10678,27 +10648,6 @@ namespace BMA.EHR.Application.Repositories.Commands
|
|||
}
|
||||
}
|
||||
|
||||
public async Task<List<PositionPath>> GetPlacementPositionPath(Guid id)
|
||||
{
|
||||
try
|
||||
{
|
||||
var data = await _dbContext.Set<PlacementProfile>()
|
||||
.Include(x => x.PositionPath)
|
||||
.Include(x => x.Placement)
|
||||
.Where(x => x.Placement!.Id == id)
|
||||
.Where(x => x.PositionPath != null)
|
||||
.Select(x => x.PositionPath)
|
||||
.Distinct()
|
||||
.ToListAsync();
|
||||
|
||||
return data!;
|
||||
}
|
||||
catch
|
||||
{
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region " Command Info "
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue