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

เพิ่มวันที่เข้า/ออกจากราชการ

Browse source
This commit is contained in:
Bright 2024-10-22 14:21:36 +07:00
parent d8d3838d5c
commit f2df44cf6a
5 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -817,6 +817,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
amount = r.amount, amount = r.amount,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
isGovernment = false,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -913,6 +914,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
amount = r.amount, amount = r.amount,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
isGovernment = false,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -1067,6 +1069,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
amount = r.amount, amount = r.amount,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
isGovernment = false
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -1179,6 +1182,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
amount = r.amount, amount = r.amount,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
isGovernment = false
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];

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

@ -1712,7 +1712,8 @@ namespace BMA.EHR.Placement.Service.Controllers
positionType = p.posTypeName == null ? string.Empty : p.posTypeName, positionType = p.posTypeName == null ? string.Empty : p.posTypeName,
positionLevel = p.posLevelName == null ? string.Empty : p.posLevelName, positionLevel = p.posLevelName == null ? string.Empty : p.posLevelName,
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}", refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
templateDoc = r.templateDoc templateDoc = r.templateDoc,
isGovernment = true
}, },
bodyPosition = new bodyPosition = new
{ {
@ -1978,7 +1979,8 @@ namespace BMA.EHR.Placement.Service.Controllers
positionType = p.posTypeName == null ? string.Empty : p.posTypeName, positionType = p.posTypeName == null ? string.Empty : p.posTypeName,
positionLevel = p.posLevelName == null ? string.Empty : p.posLevelName, positionLevel = p.posLevelName == null ? string.Empty : p.posLevelName,
refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}", refCommandNo = $"{r.commandNo}/{r.commandYear.ToThaiYear()}",
templateDoc = r.templateDoc templateDoc = r.templateDoc,
isGovernment = true
}, },
bodyPosition = new bodyPosition = new
{ {

2
BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
View file

@ -759,6 +759,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
isLeave = false, isLeave = false,
leaveReason = _null, leaveReason = _null,
dateLeave = _null, dateLeave = _null,
isGovernment = true,
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];
@ -911,6 +912,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
isLeave = false, isLeave = false,
leaveReason = _null, leaveReason = _null,
dateLeave = _null, dateLeave = _null,
isGovernment = true
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];

1
BMA.EHR.Retirement.Service/Controllers/RetirementOutController.cs
View file

@ -547,6 +547,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
isLeave = true, isLeave = true,
leaveReason = "ให้ออกจากราชการ", leaveReason = "ให้ออกจากราชการ",
dateLeave = r.commandAffectDate, dateLeave = r.commandAffectDate,
isGovernment = false
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];

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

@ -1882,6 +1882,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
isLeave = true, isLeave = true,
leaveReason = "ลาออกจากราชการ", leaveReason = "ลาออกจากราชการ",
dateLeave = r.commandAffectDate, dateLeave = r.commandAffectDate,
isGovernment = false
}).ToList(); }).ToList();
var baseAPIOrg = _configuration["API"]; var baseAPIOrg = _configuration["API"];