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

คำสั่งที่สร้างทะเบียนประวัติส่ง key รูปภาพที่อยู่บน s3 เพิ่ม #911, #1183
Some checks failed
release-dev / release-dev (push) Failing after 10s
Details

Browse source
This commit is contained in:
Bright 2025-07-07 14:34:44 +07:00
parent f2d01b8505
commit c348dae155
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Placement.Service/Controllers/PlacementController.cs
View file

@ -2066,6 +2066,7 @@ namespace BMA.EHR.Placement.Service.Controllers
var placementProfile = await _context.PlacementProfiles var placementProfile = await _context.PlacementProfiles
.Include(x => x.PlacementCertificates) .Include(x => x.PlacementCertificates)
.Include(x => x.PlacementEducations) .Include(x => x.PlacementEducations)
.Include(x => x.ProfileImg)
.Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString())) .Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString()))
.ToListAsync(); .ToListAsync();
@ -2118,6 +2119,7 @@ namespace BMA.EHR.Placement.Service.Controllers
currentZipCode = p.CurrentZipCode == null ? string.Empty : p.CurrentZipCode, currentZipCode = p.CurrentZipCode == null ? string.Empty : p.CurrentZipCode,
amount = r.amount, amount = r.amount,
amountSpecial = r.amountSpecial, amountSpecial = r.amountSpecial,
objectRefId = p.ProfileImg != null && p.ProfileImg?.ObjectRefId != null ? p.ProfileImg?.ObjectRefId.ToString("D") : null,
}, },
bodyEducations = p.PlacementEducations.Select(e => new bodyEducations = p.PlacementEducations.Select(e => new
{ {

2
BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
View file

@ -1101,6 +1101,7 @@ namespace BMA.EHR.Placement.Service.Controllers
public async Task<ActionResult<ResponseObject>> PostReportExecute([FromBody] ReportExecuteRequest req) public async Task<ActionResult<ResponseObject>> PostReportExecute([FromBody] ReportExecuteRequest req)
{ {
var data = await _context.PlacementReceives var data = await _context.PlacementReceives
.Include(x => x.Avatar)
.Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString())) .Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString()))
.ToListAsync(); .ToListAsync();
var resultData = (from p in data var resultData = (from p in data
@ -1149,6 +1150,7 @@ namespace BMA.EHR.Placement.Service.Controllers
currentZipCode = (String?)null, currentZipCode = (String?)null,
amount = r.amount, amount = r.amount,
amountSpecial = r.amountSpecial, amountSpecial = r.amountSpecial,
objectRefId = p.Avatar != null && p.Avatar?.ObjectRefId != null ? p.Avatar?.ObjectRefId.ToString("D") : null,
}, },
bodySalarys = new bodySalarys = new
{ {