From 15160c20188875c64f8e9005800c576c607c8ad7 Mon Sep 17 00:00:00 2001 From: Bright Date: Fri, 6 Dec 2024 18:38:36 +0700 Subject: [PATCH] add fields amountSpecial --- .../Controllers/PlacementAppointmentController.cs | 5 +++++ .../Controllers/PlacementController.cs | 13 +++++++++++-- .../Controllers/PlacementReceiveController.cs | 3 +++ .../Controllers/PlacementTransferController.cs | 1 + .../Requests/ReportExecuteRequest.cs | 1 + .../Controllers/RetirementOtherController.cs | 2 ++ .../Requests/ReportExecuteRequest.cs | 1 + 7 files changed, 24 insertions(+), 2 deletions(-) diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs index ed8c6e6c..519769a3 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs @@ -896,6 +896,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + amountSpecial = r.amountSpecial, commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, @@ -1105,6 +1106,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + amountSpecial = r.amountSpecial, commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, @@ -1305,6 +1307,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + amountSpecial = r.amountSpecial, commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, @@ -1507,6 +1510,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + amountSpecial = r.amountSpecial, commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, @@ -1725,6 +1729,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + amountSpecial = r.amountSpecial, commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs index 6ec8ac3e..68058676 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementController.cs @@ -1719,7 +1719,9 @@ namespace BMA.EHR.Placement.Service.Controllers currentProvinceId = (String?)null, currentDistrictId = (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 { @@ -1759,6 +1761,7 @@ namespace BMA.EHR.Placement.Service.Controllers date = r.commandAffectDate, commandId = r.commandId, amount = r.amount, + amountSpecial = r.amountSpecial, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, posNo = p.posMasterNo == null ? "" : @@ -2019,7 +2022,9 @@ namespace BMA.EHR.Placement.Service.Controllers currentProvinceId = (String?)null, currentDistrictId = (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 { @@ -2058,6 +2063,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = string.Empty, date = r.commandAffectDate, amount = r.amount, + amountSpecial = r.amountSpecial, commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, @@ -2297,6 +2303,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + amountSpecial = r.amountSpecial, commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, @@ -2522,6 +2529,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + amountSpecial = r.amountSpecial, commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, @@ -2736,6 +2744,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + amountSpecial = r.amountSpecial, commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs index 78b0c0a3..497803f6 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs @@ -1061,12 +1061,15 @@ namespace BMA.EHR.Placement.Service.Controllers currentDistrictId = (String?)null, currentSubDistrictId = (String?)null, currentZipCode = (String?)null, + amount = r.amount, + amountSpecial = r.amountSpecial, }, bodySalarys = new { profileId = string.Empty, date = r.commandAffectDate, amount = r.amount, + amountSpecial = r.amountSpecial, commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, diff --git a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs index c8404836..d0828a85 100644 --- a/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs +++ b/BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs @@ -885,6 +885,7 @@ namespace BMA.EHR.Placement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + amountSpecial = r.amountSpecial, commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, diff --git a/BMA.EHR.Placement.Service/Requests/ReportExecuteRequest.cs b/BMA.EHR.Placement.Service/Requests/ReportExecuteRequest.cs index 2bf63096..999b663d 100644 --- a/BMA.EHR.Placement.Service/Requests/ReportExecuteRequest.cs +++ b/BMA.EHR.Placement.Service/Requests/ReportExecuteRequest.cs @@ -16,6 +16,7 @@ namespace BMA.EHR.Placement.Service.Requests public int commandYear { get; set; } public string? templateDoc { get; set; } public double? amount { get; set; } + public double? amountSpecial { get; set; } public double? positionSalaryAmount { get; set; } public double? mouthSalaryAmount { get; set; } } diff --git a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs index 7155c451..2f5d1bed 100644 --- a/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs +++ b/BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs @@ -774,6 +774,7 @@ namespace BMA.EHR.Retirement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + amountSpecial = r.amountSpecial, commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, @@ -978,6 +979,7 @@ namespace BMA.EHR.Retirement.Service.Controllers profileId = p.profileId, date = r.commandAffectDate, amount = r.amount, + amountSpecial = r.amountSpecial, commandId = r.commandId, positionSalaryAmount = r.positionSalaryAmount, mouthSalaryAmount = r.mouthSalaryAmount, diff --git a/BMA.EHR.Retirement.Service/Requests/ReportExecuteRequest.cs b/BMA.EHR.Retirement.Service/Requests/ReportExecuteRequest.cs index 34e0e4f6..cf161c9c 100644 --- a/BMA.EHR.Retirement.Service/Requests/ReportExecuteRequest.cs +++ b/BMA.EHR.Retirement.Service/Requests/ReportExecuteRequest.cs @@ -16,6 +16,7 @@ namespace BMA.EHR.Retirement.Service.Requests public int commandYear { get; set; } public string? templateDoc { get; set; } public double? amount { get; set; } + public double? amountSpecial { get; set; } public double? positionSalaryAmount { get; set; } public double? mouthSalaryAmount { get; set; } }