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

ปรับให้เป็น process ที่ควรบันทึกตามลำดับ #224
All checks were successful
Build & Deploy Retirement Service / build (push) Successful in 1m46s
Details
Build & Deploy Placement Service / build (push) Successful in 1m56s
Details
Build & Deploy Discipline Service / build (push) Successful in 1m55s
Details

Browse source
This commit is contained in:
harid 2026-05-01 11:20:15 +07:00
parent 2bdb8bb733
commit 5b0fcd0680
10 changed files with 260 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2541,6 +2541,11 @@ namespace BMA.EHR.Placement.Service.Controllers
var data = await _context.PlacementProfiles
.Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString()))
.ToListAsync();
// Task #224 ปรับให้เป็น process ที่ควรบันทึกตามลำดับ
data.ForEach(profile => profile.PlacementStatus = "DONE");
await _context.SaveChangesAsync();
var resultData = (from p in data
join r in req.refIds
on p.Id.ToString() equals r.refId
@ -2590,12 +2595,12 @@ namespace BMA.EHR.Placement.Service.Controllers
{
data = resultData,
});
var _result = await _res.Content.ReadAsStringAsync();
if (_res.IsSuccessStatusCode)
{
data.ForEach(profile => profile.PlacementStatus = "DONE");
await _context.SaveChangesAsync();
}
//// var _result = await _res.Content.ReadAsStringAsync();
//// if (_res.IsSuccessStatusCode)
//// {
//// data.ForEach(profile => profile.PlacementStatus = "DONE");
//// await _context.SaveChangesAsync();
//// }
}
return Success();
}
@ -2777,6 +2782,11 @@ namespace BMA.EHR.Placement.Service.Controllers
var data = await _context.PlacementProfiles
.Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString()))
.ToListAsync();
// Task #224 ปรับให้เป็น process ที่ควรบันทึกตามลำดับ
data.ForEach(profile => profile.PlacementStatus = "DONE");
await _context.SaveChangesAsync();
var resultData = (from p in data
join r in req.refIds
on p.Id.ToString() equals r.refId
@ -2826,12 +2836,12 @@ namespace BMA.EHR.Placement.Service.Controllers
{
data = resultData,
});
var _result = await _res.Content.ReadAsStringAsync();
if (_res.IsSuccessStatusCode)
{
data.ForEach(profile => profile.PlacementStatus = "DONE");
await _context.SaveChangesAsync();
}
//// var _result = await _res.Content.ReadAsStringAsync();
//// if (_res.IsSuccessStatusCode)
//// {
//// data.ForEach(profile => profile.PlacementStatus = "DONE");
//// await _context.SaveChangesAsync();
//// }
}
return Success();
}
@ -2998,6 +3008,11 @@ namespace BMA.EHR.Placement.Service.Controllers
var data = await _context.PlacementProfiles
.Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString()))
.ToListAsync();
// Task #224 ปรับให้เป็น process ที่ควรบันทึกตามลำดับ
data.ForEach(profile => profile.PlacementStatus = "DONE");
await _context.SaveChangesAsync();
var resultData = (from p in data
join r in req.refIds
on p.Id.ToString() equals r.refId
@ -3047,12 +3062,12 @@ namespace BMA.EHR.Placement.Service.Controllers
{
data = resultData,
});
var _result = await _res.Content.ReadAsStringAsync();
if (_res.IsSuccessStatusCode)
{
data.ForEach(profile => profile.PlacementStatus = "DONE");
await _context.SaveChangesAsync();
}
//// var _result = await _res.Content.ReadAsStringAsync();
//// if (_res.IsSuccessStatusCode)
//// {
//// data.ForEach(profile => profile.PlacementStatus = "DONE");
//// await _context.SaveChangesAsync();
//// }
}
return Success();
}

32
BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
View file

@ -758,6 +758,17 @@ namespace BMA.EHR.Placement.Service.Controllers
var data = await _context.PlacementOfficers
.Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString()))
.ToListAsync();
// Task #224 ปรับให้เป็น process ที่ควรบันทึกตามลำดับ
var firstRef = req.refIds.FirstOrDefault();
var commandNoText = firstRef != null ? $"{firstRef.commandNo}/{firstRef.commandYear.ToThaiYear()}" : null;
foreach (var profile in data)
{
profile.Status = "DONE";
profile.commandNo = commandNoText;
}
await _context.SaveChangesAsync();
var resultData = (from p in data
join r in req.refIds
on p.Id.ToString() equals r.refId
@ -809,17 +820,16 @@ namespace BMA.EHR.Placement.Service.Controllers
{
data = resultData,
});
var _result = await _res.Content.ReadAsStringAsync();
if (_res.IsSuccessStatusCode)
{
//data.ForEach(profile => profile.Status = "DONE");
foreach (var profile in data)
{
profile.Status = "DONE";
profile.commandNo = resultData.Count > 0 ? $"{resultData[0].commandNo}/{resultData[0].commandYear.ToThaiYear()}" : null;
}
await _context.SaveChangesAsync();
}
//// var _result = await _res.Content.ReadAsStringAsync();
//// if (_res.IsSuccessStatusCode)
//// {
//// foreach (var profile in data)
//// {
//// profile.Status = "DONE";
//// profile.commandNo = resultData.Count > 0 ? $"{resultData[0].commandNo}/{resultData[0].commandYear.ToThaiYear()}" : null;
//// }
//// await _context.SaveChangesAsync();
//// }
}
return Success();
}

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

@ -1124,6 +1124,10 @@ namespace BMA.EHR.Placement.Service.Controllers
.Include(x => x.Avatar)
.Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString()))
.ToListAsync();
// Task #224 ปรับให้เป็น process ที่ควรบันทึกตามลำดับ
data.ForEach(profile => profile.Status = "DONE");
await _context.SaveChangesAsync();
var resultData = (from p in data
join r in req.refIds
on p.Id.ToString() equals r.refId
@ -1223,12 +1227,12 @@ namespace BMA.EHR.Placement.Service.Controllers
{
data = resultData,
});
var _result = await _res.Content.ReadAsStringAsync();
if (_res.IsSuccessStatusCode)
{
data.ForEach(profile => profile.Status = "DONE");
await _context.SaveChangesAsync();
}
// // var _result = await _res.Content.ReadAsStringAsync();
// // if (_res.IsSuccessStatusCode)
// // {
// // data.ForEach(profile => profile.Status = "DONE");
// // await _context.SaveChangesAsync();
// // }
}
return Success();
}

16
BMA.EHR.Placement.Service/Controllers/PlacementRepatriationController.cs
View file

@ -623,6 +623,10 @@ namespace BMA.EHR.Placement.Service.Controllers
var data = await _context.PlacementRepatriations
.Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString()))
.ToListAsync();
// Task #224 ปรับให้เป็น process ที่ควรบันทึกตามลำดับ
data.ForEach(profile => profile.Status = "DONE");
await _context.SaveChangesAsync();
string? _null = null;
var resultData = (from p in data
join r in req.refIds
@ -675,12 +679,12 @@ namespace BMA.EHR.Placement.Service.Controllers
{
data = resultData,
});
var _result = await _res.Content.ReadAsStringAsync();
if (_res.IsSuccessStatusCode)
{
data.ForEach(profile => profile.Status = "DONE");
await _context.SaveChangesAsync();
}
// // var _result = await _res.Content.ReadAsStringAsync();
// // if (_res.IsSuccessStatusCode)
// // {
// // data.ForEach(profile => profile.Status = "DONE");
// // await _context.SaveChangesAsync();
// // }
}
return Success();
}

16
BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
View file

@ -1094,6 +1094,10 @@ namespace BMA.EHR.Placement.Service.Controllers
var data = await _context.PlacementTransfers
.Where(x => req.refIds.Select(x => x.refId).Contains(x.Id.ToString()))
.ToListAsync();
// Task #224 ปรับให้เป็น process ที่ควรบันทึกตามลำดับ
data.ForEach(profile => profile.Status = "DONE");
await _context.SaveChangesAsync();
var resultData = (from p in data
join r in req.refIds
on p.Id.ToString() equals r.refId
@ -1146,12 +1150,12 @@ namespace BMA.EHR.Placement.Service.Controllers
{
data = resultData,
});
var _result = await _res.Content.ReadAsStringAsync();
if (_res.IsSuccessStatusCode)
{
data.ForEach(profile => profile.Status = "DONE");
await _context.SaveChangesAsync();
}
// // var _result = await _res.Content.ReadAsStringAsync();
// // if (_res.IsSuccessStatusCode)
// // {
// // data.ForEach(profile => profile.Status = "DONE");
// // await _context.SaveChangesAsync();
// // }
}
return Success();
}