From c348dae1552db2e1a50bf84c55ea823a1f422c6d Mon Sep 17 00:00:00 2001 From: Bright Date: Mon, 7 Jul 2025 14:34:44 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88?= =?UTF-8?q?=E0=B8=87=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=AA=E0=B8=A3=E0=B9=89?= =?UTF-8?q?=E0=B8=B2=E0=B8=87=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?= =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?= =?UTF-8?q?=E0=B8=95=E0=B8=B4=E0=B8=AA=E0=B9=88=E0=B8=87=20key=20=E0=B8=A3?= =?UTF-8?q?=E0=B8=B9=E0=B8=9B=E0=B8=A0=E0=B8=B2=E0=B8=9E=E0=B8=97=E0=B8=B5?= =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=A2=E0=B8=B9=E0=B9=88=E0=B8=9A=E0=B8=99?= =?UTF-8?q?=20s3=20=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=20#911,?= =?UTF-8?q?=20#1183?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BMA.EHR.Placement.Service/Controllers/PlacementController.cs | 2 ++ .../Controllers/PlacementReceiveController.cs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index 8cdeadbc..d3aa7790 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -2066,6 +2066,7 @@ namespace BMA.EHR.Placement.Service.Controllers var placementProfile = await _context.PlacementProfiles .Include(x => x.PlacementCertificates) .Include(x => x.PlacementEducations) + .Include(x => x.ProfileImg) .Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString())) .ToListAsync(); @@ -2118,6 +2119,7 @@ namespace BMA.EHR.Placement.Service.Controllers currentZipCode = p.CurrentZipCode == null ? string.Empty : p.CurrentZipCode, amount = r.amount, amountSpecial = r.amountSpecial, + objectRefId = p.ProfileImg != null && p.ProfileImg?.ObjectRefId != null ? p.ProfileImg?.ObjectRefId.ToString("D") : null, }, bodyEducations = p.PlacementEducations.Select(e => new { diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs index 6eba03ee..412dbeaf 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -1101,6 +1101,7 @@ namespace BMA.EHR.Placement.Service.Controllers public async Task> PostReportExecute([FromBody] ReportExecuteRequest req) { var data = await _context.PlacementReceives + .Include(x => x.Avatar) .Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString())) .ToListAsync(); var resultData = (from p in data @@ -1149,6 +1150,7 @@ namespace BMA.EHR.Placement.Service.Controllers currentZipCode = (String?)null, amount = r.amount, amountSpecial = r.amountSpecial, + objectRefId = p.Avatar != null && p.Avatar?.ObjectRefId != null ? p.Avatar?.ObjectRefId.ToString("D") : null, }, bodySalarys = new {