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

add fields amountSpecial

Browse source
This commit is contained in:
Bright 2024-12-06 18:38:36 +07:00
parent 7cd06be198
commit 15160c2018
7 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
View file

@ -896,6 +896,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
amountSpecial = r.amountSpecial,
commandId = r.commandId, commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
@ -1105,6 +1106,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
amountSpecial = r.amountSpecial,
commandId = r.commandId, commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
@ -1305,6 +1307,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
amountSpecial = r.amountSpecial,
commandId = r.commandId, commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
@ -1507,6 +1510,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
amountSpecial = r.amountSpecial,
commandId = r.commandId, commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
@ -1725,6 +1729,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
amountSpecial = r.amountSpecial,
commandId = r.commandId, commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,

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

@ -1719,7 +1719,9 @@ namespace BMA.EHR.Placement.Service.Controllers
currentProvinceId = (String?)null, currentProvinceId = (String?)null,
currentDistrictId = (String?)null, currentDistrictId = (String?)null,
currentSubDistrictId = (String?)null, currentSubDistrictId = (String?)null,
currentZipCode = p.CurrentZipCode == null ? string.Empty : p.CurrentZipCode currentZipCode = p.CurrentZipCode == null ? string.Empty : p.CurrentZipCode,
amount = r.amount,
amountSpecial = r.amountSpecial,
}, },
bodyEducations = p.PlacementEducations.Select(e => new bodyEducations = p.PlacementEducations.Select(e => new
{ {
@ -1759,6 +1761,7 @@ namespace BMA.EHR.Placement.Service.Controllers
date = r.commandAffectDate, date = r.commandAffectDate,
commandId = r.commandId, commandId = r.commandId,
amount = r.amount, amount = r.amount,
amountSpecial = r.amountSpecial,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
posNo = p.posMasterNo == null ? "" : posNo = p.posMasterNo == null ? "" :
@ -2019,7 +2022,9 @@ namespace BMA.EHR.Placement.Service.Controllers
currentProvinceId = (String?)null, currentProvinceId = (String?)null,
currentDistrictId = (String?)null, currentDistrictId = (String?)null,
currentSubDistrictId = (String?)null, currentSubDistrictId = (String?)null,
currentZipCode = p.CurrentZipCode == null ? string.Empty : p.CurrentZipCode currentZipCode = p.CurrentZipCode == null ? string.Empty : p.CurrentZipCode,
amount = r.amount,
amountSpecial = r.amountSpecial,
}, },
bodyEducations = p.PlacementEducations.Select(e => new bodyEducations = p.PlacementEducations.Select(e => new
{ {
@ -2058,6 +2063,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = string.Empty, profileId = string.Empty,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
amountSpecial = r.amountSpecial,
commandId = r.commandId, commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
@ -2297,6 +2303,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
amountSpecial = r.amountSpecial,
commandId = r.commandId, commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
@ -2522,6 +2529,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
amountSpecial = r.amountSpecial,
commandId = r.commandId, commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
@ -2736,6 +2744,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
amountSpecial = r.amountSpecial,
commandId = r.commandId, commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,

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

@ -1061,12 +1061,15 @@ namespace BMA.EHR.Placement.Service.Controllers
currentDistrictId = (String?)null, currentDistrictId = (String?)null,
currentSubDistrictId = (String?)null, currentSubDistrictId = (String?)null,
currentZipCode = (String?)null, currentZipCode = (String?)null,
amount = r.amount,
amountSpecial = r.amountSpecial,
}, },
bodySalarys = new bodySalarys = new
{ {
profileId = string.Empty, profileId = string.Empty,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
amountSpecial = r.amountSpecial,
commandId = r.commandId, commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,

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

@ -885,6 +885,7 @@ namespace BMA.EHR.Placement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
amountSpecial = r.amountSpecial,
commandId = r.commandId, commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,

1
BMA.EHR.Placement.Service/Requests/ReportExecuteRequest.cs
View file

@ -16,6 +16,7 @@ namespace BMA.EHR.Placement.Service.Requests
public int commandYear { get; set; } public int commandYear { get; set; }
public string? templateDoc { get; set; } public string? templateDoc { get; set; }
public double? amount { get; set; } public double? amount { get; set; }
public double? amountSpecial { get; set; }
public double? positionSalaryAmount { get; set; } public double? positionSalaryAmount { get; set; }
public double? mouthSalaryAmount { get; set; } public double? mouthSalaryAmount { get; set; }
} }

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

@ -774,6 +774,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
amountSpecial = r.amountSpecial,
commandId = r.commandId, commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,
@ -978,6 +979,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
profileId = p.profileId, profileId = p.profileId,
date = r.commandAffectDate, date = r.commandAffectDate,
amount = r.amount, amount = r.amount,
amountSpecial = r.amountSpecial,
commandId = r.commandId, commandId = r.commandId,
positionSalaryAmount = r.positionSalaryAmount, positionSalaryAmount = r.positionSalaryAmount,
mouthSalaryAmount = r.mouthSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount,

1
BMA.EHR.Retirement.Service/Requests/ReportExecuteRequest.cs
View file

@ -16,6 +16,7 @@ namespace BMA.EHR.Retirement.Service.Requests
public int commandYear { get; set; } public int commandYear { get; set; }
public string? templateDoc { get; set; } public string? templateDoc { get; set; }
public double? amount { get; set; } public double? amount { get; set; }
public double? amountSpecial { get; set; }
public double? positionSalaryAmount { get; set; } public double? positionSalaryAmount { get; set; }
public double? mouthSalaryAmount { get; set; } public double? mouthSalaryAmount { get; set; }
} }