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

#1409 แก้เป็นส่ง refId ของคำสั่งขอลาออกไปค้นที่ command ก่อนอัพ status = CANCEL
Some checks failed
release-dev / release-dev (push) Failing after 10s
Details

Browse source
This commit is contained in:
Bright 2025-09-29 11:44:31 +07:00
parent 081260a83b
commit be45cf58b8
2 changed files with 42 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

41
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -3047,6 +3047,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
commandCode = r.commandCode, commandCode = r.commandCode,
commandName = r.commandName, commandName = r.commandName,
remark = r.remark, remark = r.remark,
resignId = p.RetirementResign.Id,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -3075,26 +3076,26 @@ namespace BMA.EHR.Retirement.Service.Controllers
} }
} }
} }
else //else
{ //{
var apiUrlOrg = $"{baseAPIOrg}/org/command/cancel-resign"; // var apiUrlOrg = $"{baseAPIOrg}/org/command/cancel-resign";
using (var client = new HttpClient()) // using (var client = new HttpClient())
{ // {
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", "")); // client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]); // client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
var _res = await client.PostAsJsonAsync(apiUrlOrg, new // var _res = await client.PostAsJsonAsync(apiUrlOrg, new
{ // {
commandId = resultData.Select(x => x.commandId).ToList(), // commandId = resultData.Select(x => x.commandId).ToList(),
}); // });
var _result = await _res.Content.ReadAsStringAsync(); // var _result = await _res.Content.ReadAsStringAsync();
if (_res.IsSuccessStatusCode) // if (_res.IsSuccessStatusCode)
{ // {
data.ForEach(profile => profile.Status = "DONE"); // data.ForEach(profile => profile.Status = "DONE");
data.ForEach(profile => profile.RetirementResign.Status = "CANCEL"); // data.ForEach(profile => profile.RetirementResign.Status = "CANCEL");
await _context.SaveChangesAsync(); // await _context.SaveChangesAsync();
} // }
} // }
} //}
return Success(); return Success();
} }

41
BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
View file

@ -2542,6 +2542,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
commandCode = r.commandCode, commandCode = r.commandCode,
commandName = r.commandName, commandName = r.commandName,
remark = r.remark, remark = r.remark,
resignId = p.RetirementResignEmployee.Id
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -2571,26 +2572,26 @@ namespace BMA.EHR.Retirement.Service.Controllers
} }
} }
} }
else //else
{ //{
var apiUrlOrg = $"{baseAPIOrg}/org/command/cancel-resign"; // var apiUrlOrg = $"{baseAPIOrg}/org/command/cancel-resign";
using (var client = new HttpClient()) // using (var client = new HttpClient())
{ // {
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", "")); // client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]); // client.DefaultRequestHeaders.Add("api_key", _configuration["API_KEY"]);
var _res = await client.PostAsJsonAsync(apiUrlOrg, new // var _res = await client.PostAsJsonAsync(apiUrlOrg, new
{ // {
commandId = resultData.Select(x => x.commandId).ToList(), // commandId = resultData.Select(x => x.commandId).ToList(),
}); // });
var _result = await _res.Content.ReadAsStringAsync(); // var _result = await _res.Content.ReadAsStringAsync();
if (_res.IsSuccessStatusCode) // if (_res.IsSuccessStatusCode)
{ // {
data.ForEach(profile => profile.Status = "DONE"); // data.ForEach(profile => profile.Status = "DONE");
data.ForEach(profile => profile.RetirementResignEmployee.Status = "CANCEL"); // data.ForEach(profile => profile.RetirementResignEmployee.Status = "CANCEL");
await _context.SaveChangesAsync(); // await _context.SaveChangesAsync();
} // }
} // }
} //}
return Success(); return Success();
} }