From 306fb91fcce77db1560bbede0a3139573734a181 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Wed, 11 Oct 2023 12:10:01 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=A3=E0=B8=B2?= =?UTF-8?q?=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=20=E0=B9=81=E0=B8=A5?= =?UTF-8?q?=E0=B8=B0=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9A=E0=B8=B1=E0=B9=89?= =?UTF-8?q?=E0=B8=81=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B8=AD=E0=B8=81=20c-pm-2?= =?UTF-8?q?2=20=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B9=83=E0=B8=AA=E0=B9=88?= =?UTF-8?q?=E0=B9=80=E0=B8=AD=E0=B8=81=E0=B8=AA=E0=B8=B2=E0=B8=A3=E0=B8=AB?= =?UTF-8?q?=E0=B8=A5=E0=B8=B1=E0=B8=81=E0=B8=90=E0=B8=B2=E0=B8=99=E0=B9=80?= =?UTF-8?q?=E0=B8=A1=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=97=E0=B8=B3=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=9A=E0=B8=A3=E0=B8=A3=E0=B8=88=E0=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Commands/CommandRepository.cs | 29 +++++++++++++++++- .../02-คำสั่งบรรจุและแต่งตั้งผู้ได้รับคัดเลือก-4.trdp | Bin 3096 -> 3128 bytes 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs index ef3c4184..0f84c302 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs @@ -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() + .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() @@ -2090,6 +2110,9 @@ namespace BMA.EHR.Application.Repositories.Commands foreach (var recv in command.Receivers) { var placementProfile = await _dbContext.Set() + .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() + .Include(x => x.PlacementProfileDocs) + .ThenInclude(x => x.Document) + + .Include(x => x.Prefix) .Include(x => x.FatherPrefix) .Include(x => x.MotherPrefix) diff --git a/BMA.EHR.Report.Service/Reports/02-คำสั่งบรรจุและแต่งตั้งผู้ได้รับคัดเลือก-4.trdp b/BMA.EHR.Report.Service/Reports/02-คำสั่งบรรจุและแต่งตั้งผู้ได้รับคัดเลือก-4.trdp index 32330628eb204ca70de7dad3e4b7e634811a34d8..f04d1a0f935e0fc3f3da0b9b340edef466a40e09 100644 GIT binary patch delta 2810 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 M0001`3jhEB0I27GVE_OC delta 2782 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