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

no message

Browse source
This commit is contained in:
kittapath 2025-01-09 11:50:36 +07:00
parent 74f05fccfe
commit 5604d7076e
14 changed files with 92 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

48
BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
View file

@ -824,6 +824,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
mouthSalaryAmount = r.mouthSalaryAmount,
isGovernment = false,
profileType = p.profileType,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList();
var baseAPIOrg = _configuration["API"];
@ -922,6 +924,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
mouthSalaryAmount = r.mouthSalaryAmount,
isGovernment = false,
profileType = p.profileType,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList();
var baseAPIOrg = _configuration["API"];
@ -1021,17 +1025,17 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
.ToListAsync();
var report_data = (from p in data
join r in req.refIds
on p.Id.ToString() equals r.refId
select new
{
fullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
positionname = p.Position,
positionno = p.PosNo,
organizationname = p.Organization,
salary = r.Amount,
RemarkHorizontal = r.RemarkHorizontal
}).ToList();
join r in req.refIds
on p.Id.ToString() equals r.refId
select new
{
fullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
positionname = p.Position,
positionno = p.PosNo,
organizationname = p.Organization,
salary = r.Amount,
RemarkHorizontal = r.RemarkHorizontal
}).ToList();
var result = new List<dynamic>();
@ -1039,8 +1043,10 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
{
result.Add(r);
string? _null = null;
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new {
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
result.Add(new
{
fullName = _null,
positionname = r.RemarkHorizontal,
positionno = _null,
@ -1095,6 +1101,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
mouthSalaryAmount = r.mouthSalaryAmount,
isGovernment = false,
profileType = p.profileType,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList();
var baseAPIOrg = _configuration["API"];
@ -1209,6 +1217,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
mouthSalaryAmount = r.mouthSalaryAmount,
isGovernment = false,
profileType = p.profileType,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList();
var baseAPIOrg = _configuration["API"];
@ -1321,6 +1331,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
profileType = p.profileType,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList();
var baseAPIOrg = _configuration["API"];
@ -1433,6 +1445,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
profileType = p.profileType,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList();
var baseAPIOrg = _configuration["API"];
@ -1545,6 +1559,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
profileType = p.profileType,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList();
var baseAPIOrg = _configuration["API"];
@ -1657,6 +1673,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
profileType = p.profileType,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList();
var baseAPIOrg = _configuration["API"];
@ -1769,6 +1787,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
profileType = p.profileType,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList();
var baseAPIOrg = _configuration["API"];
@ -1897,6 +1917,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount,
profileType = p.profileType,
refCommandCode = r.refCommandCode,
refCommandName = r.refCommandName,
}).ToList();
var baseAPIOrg = _configuration["API"];
var apiUrlOrg = $"{baseAPIOrg}/org/command/excexute/salary-leave-discipline";