diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 37baaa9..6954e00 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -3005,11 +3005,11 @@ export class ReportController extends Controller { ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString()) : null, precentTwo: - profile.positionSalaryAmountPer == 0.2 + profile.positionSalaryAmountPer == 0.02 ? profile.positionSalaryAmount * profile.positionSalaryAmountPer : null, //ร้อยละ 2 precentFour: - profile.positionSalaryAmountPer == 0.4 + profile.positionSalaryAmountPer == 0.04 ? profile.positionSalaryAmount * profile.positionSalaryAmountPer : null, //ร้อยละ 4 reason: null, // หมายเหตุ diff --git a/src/controllers/SalaryPeriodEmployeeController.ts b/src/controllers/SalaryPeriodEmployeeController.ts index 28fbd4c..933651f 100644 --- a/src/controllers/SalaryPeriodEmployeeController.ts +++ b/src/controllers/SalaryPeriodEmployeeController.ts @@ -349,23 +349,23 @@ export class SalaryPeriodEmployeeController extends Controller { salaryRankAmountMax == null ? 0 : salaryRankAmountMax.step; if (salaryRankAmountMax != null) { if (step - salaryRankAmountMax.step <= 0.5) { - salaryProfile.positionSalaryAmountPer = 0.2; + salaryProfile.positionSalaryAmountPer = 0.02; salaryProfile.amountSpecial = salaryRankAmountMax == null || salaryRankAmountMax.salaryMonth == null ? 0 - : salaryRankAmountMax.salaryMonth * 0.2; + : salaryRankAmountMax.salaryMonth * 0.02; } else if (step - salaryRankAmountMax.step <= 1) { - salaryProfile.positionSalaryAmountPer = 0.4; + salaryProfile.positionSalaryAmountPer = 0.04; salaryProfile.amountSpecial = salaryRankAmountMax == null || salaryRankAmountMax.salaryMonth == null ? 0 - : salaryRankAmountMax.salaryMonth * 0.4; + : salaryRankAmountMax.salaryMonth * 0.04; } else { - salaryProfile.positionSalaryAmountPer = 0.6; + salaryProfile.positionSalaryAmountPer = 0.06; salaryProfile.amountSpecial = salaryRankAmountMax == null || salaryRankAmountMax.salaryMonth == null ? 0 - : salaryRankAmountMax.salaryMonth * 0.6; + : salaryRankAmountMax.salaryMonth * 0.06; } } else { salaryProfile.positionSalaryAmountPer = 0; @@ -678,23 +678,23 @@ export class SalaryPeriodEmployeeController extends Controller { salaryProfile.salaryLevelNew = salaryRankAmountMax == null ? 0 : salaryRankAmountMax.step; if (salaryRankAmountMax != null) { if (step - salaryRankAmountMax.step <= 0.5) { - salaryProfile.positionSalaryAmountPer = 0.2; + salaryProfile.positionSalaryAmountPer = 0.02; salaryProfile.amountSpecial = salaryRankAmountMax == null || salaryRankAmountMax.salaryMonth == null ? 0 - : salaryRankAmountMax.salaryMonth * 0.2; + : salaryRankAmountMax.salaryMonth * 0.02; } else if (step - salaryRankAmountMax.step <= 1) { - salaryProfile.positionSalaryAmountPer = 0.4; + salaryProfile.positionSalaryAmountPer = 0.04; salaryProfile.amountSpecial = salaryRankAmountMax == null || salaryRankAmountMax.salaryMonth == null ? 0 - : salaryRankAmountMax.salaryMonth * 0.4; + : salaryRankAmountMax.salaryMonth * 0.04; } else { - salaryProfile.positionSalaryAmountPer = 0.6; + salaryProfile.positionSalaryAmountPer = 0.06; salaryProfile.amountSpecial = salaryRankAmountMax == null || salaryRankAmountMax.salaryMonth == null ? 0 - : salaryRankAmountMax.salaryMonth * 0.6; + : salaryRankAmountMax.salaryMonth * 0.06; } } else { salaryProfile.positionSalaryAmountPer = 0; @@ -1065,23 +1065,23 @@ export class SalaryPeriodEmployeeController extends Controller { salaryProfile.salaryLevelNew = salaryRankAmountMax == null ? 0 : salaryRankAmountMax.step; if (salaryRankAmountMax != null) { if (step - salaryRankAmountMax.step <= 0.5) { - salaryProfile.positionSalaryAmountPer = 0.2; + salaryProfile.positionSalaryAmountPer = 0.02; salaryProfile.amountSpecial = salaryRankAmountMax == null || salaryRankAmountMax.salaryMonth == null ? 0 - : salaryRankAmountMax.salaryMonth * 0.2; + : salaryRankAmountMax.salaryMonth * 0.02; } else if (step - salaryRankAmountMax.step <= 1) { - salaryProfile.positionSalaryAmountPer = 0.4; + salaryProfile.positionSalaryAmountPer = 0.04; salaryProfile.amountSpecial = salaryRankAmountMax == null || salaryRankAmountMax.salaryMonth == null ? 0 - : salaryRankAmountMax.salaryMonth * 0.4; + : salaryRankAmountMax.salaryMonth * 0.04; } else { - salaryProfile.positionSalaryAmountPer = 0.6; + salaryProfile.positionSalaryAmountPer = 0.06; salaryProfile.amountSpecial = salaryRankAmountMax == null || salaryRankAmountMax.salaryMonth == null ? 0 - : salaryRankAmountMax.salaryMonth * 0.6; + : salaryRankAmountMax.salaryMonth * 0.06; } } else { salaryProfile.positionSalaryAmountPer = 0;