hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

แก้รายงาน และแก้บั้กเลือก c-pm-22 และใส่เอกสารหลักฐานเมื่อทำการบรรจุ

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-10-11 12:10:01 +07:00
parent cc4e2fa0d6
commit 306fb91fcc
2 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

29
BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
View file

@ -1501,7 +1501,7 @@ namespace BMA.EHR.Application.Repositories.Commands
//.Where(x => x.OrganizationPosition!.Organization!.Id == command.OwnerGovId)
.Where(x => !otherCommandReceivers.Contains(x.CitizenId!))
.Where(x => x.Status.Trim().ToUpper() == "REPORT")
.Where(x => x.CommandType!.Id == command.CommandType!.Id)
//.Where(x => x.CommandType!.Id == command.CommandType!.Id)
.Where(x => x.Profile.ProfileType == "employee")
.OrderBy(x => x.CitizenId)
.ToListAsync();
@ -1697,6 +1697,9 @@ namespace BMA.EHR.Application.Repositories.Commands
{
// query placement Profile
var placementProfile = await _dbContext.Set<PlacementProfile>()
.Include(x => x.PlacementProfileDocs)
.ThenInclude(x => x.Document)
.Include(x => x.Prefix)
.Include(x => x.FatherPrefix)
.Include(x => x.MotherPrefix)
@ -1889,6 +1892,23 @@ namespace BMA.EHR.Application.Repositories.Commands
});
}
// add profile document
foreach(var doc in placementProfile.PlacementProfileDocs)
{
profile.Papers.Add(new ProfilePaper
{
CategoryName = "Profile Documents",
Document = doc.Document,
Detail = doc.Document.FileName,
CreatedAt = DateTime.Now,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
LastUpdatedAt = DateTime.Now,
LastUpdateFullName = FullName ?? "System Administrator",
LastUpdateUserId = UserId ?? "",
});
}
// add profile salary
var oc = _dbContext.Set<OrganizationEntity>()
@ -2090,6 +2110,9 @@ namespace BMA.EHR.Application.Repositories.Commands
foreach (var recv in command.Receivers)
{
var placementProfile = await _dbContext.Set<PlacementProfile>()
.Include(x => x.PlacementProfileDocs)
.ThenInclude(x => x.Document)
.Include(x => x.Prefix)
.Include(x => x.FatherPrefix)
.Include(x => x.MotherPrefix)
@ -2337,6 +2360,10 @@ namespace BMA.EHR.Application.Repositories.Commands
foreach (var recv in command.Receivers)
{
var placementProfile = await _dbContext.Set<PlacementProfile>()
.Include(x => x.PlacementProfileDocs)
.ThenInclude(x => x.Document)
.Include(x => x.Prefix)
.Include(x => x.FatherPrefix)
.Include(x => x.MotherPrefix)