From 161099dbe7eb0e44e5508b401571dde734746e39 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Tue, 5 Mar 2024 14:41:40 +0700 Subject: [PATCH] =?UTF-8?q?fix=20=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99?= =?UTF-8?q?=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/SalaryPeriodController.ts | 42 +++++++++++------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts index 458b2d4..e039e9f 100644 --- a/src/controllers/SalaryPeriodController.ts +++ b/src/controllers/SalaryPeriodController.ts @@ -247,7 +247,7 @@ export class SalaryPeriodController extends Controller { salaryProfile.amountSpecial = 0; salaryProfile.amountUse = 0; salaryProfile.positionSalaryAmount = - salaryProfile.amount == null ? 0 : salaryProfile.amount + salaryProfile.amountUse; + salaryProfile.amount == null ? 0 : salaryProfile.amount; } else if (salaryProfile.type == "PENDING") { salaryProfile.amountSpecial = 0; salaryProfile.amountUse = 0; @@ -263,11 +263,11 @@ export class SalaryPeriodController extends Controller { salaryRanks.salaryHalf == null || salaryProfile.amount == null ? 0 - : salaryRanks.salaryHalf - salaryProfile.amount; + : salaryRanks.salaryHalf - salaryProfile.amount + salaryRanks.salaryHalfSpecial; salaryProfile.positionSalaryAmount = salaryRanks == null || salaryRanks.salaryHalf == null ? 0 - : salaryRanks.salaryHalf + salaryProfile.amountUse; + : salaryRanks.salaryHalf; } else if (salaryProfile.type == "FULL") { salaryProfile.amountSpecial = salaryRanks == null || salaryRanks.salaryFullSpecial == null @@ -279,11 +279,11 @@ export class SalaryPeriodController extends Controller { salaryRanks.salaryFull == null || salaryProfile.amount == null ? 0 - : salaryRanks.salaryFull - salaryProfile.amount; + : salaryRanks.salaryFull - salaryProfile.amount + salaryRanks.salaryFullSpecial; salaryProfile.positionSalaryAmount = salaryRanks == null || salaryRanks.salaryFull == null ? 0 - : salaryRanks.salaryFull + salaryProfile.amountUse; + : salaryRanks.salaryFull; } else if (salaryProfile.type == "FULLHAFT") { salaryProfile.amountSpecial = salaryRanks == null || salaryRanks.salaryFullHalfSpecial == null @@ -295,11 +295,11 @@ export class SalaryPeriodController extends Controller { salaryRanks.salaryFullHalf == null || salaryProfile.amount == null ? 0 - : salaryRanks.salaryFullHalf - salaryProfile.amount; + : salaryRanks.salaryFullHalf - salaryProfile.amount + salaryRanks.salaryFullHalfSpecial; salaryProfile.positionSalaryAmount = salaryRanks == null || salaryRanks.salaryFullHalf == null ? 0 - : salaryRanks.salaryFullHalf + salaryProfile.amountUse; + : salaryRanks.salaryFullHalf; } else { throw new HttpError(HttpStatusCode.NOT_FOUND, "ประเภทการเลื่อนขึ้นเงินเดือนไม่ถูกต้อง"); } @@ -486,7 +486,7 @@ export class SalaryPeriodController extends Controller { salaryProfile.amountSpecial = 0; salaryProfile.amountUse = 0; salaryProfile.positionSalaryAmount = - salaryProfile.amount == null ? 0 : salaryProfile.amount + salaryProfile.amountUse; + salaryProfile.amount == null ? 0 : salaryProfile.amount; } else if (body.type == "PENDING") { salaryProfile.amountSpecial = 0; salaryProfile.amountUse = 0; @@ -502,11 +502,11 @@ export class SalaryPeriodController extends Controller { salaryRanks.salaryHalf == null || salaryProfile.amount == null ? 0 - : salaryRanks.salaryHalf - salaryProfile.amount; + : salaryRanks.salaryHalf - salaryProfile.amount + salaryRanks.salaryHalfSpecial; salaryProfile.positionSalaryAmount = salaryRanks == null || salaryRanks.salaryHalf == null ? 0 - : salaryRanks.salaryHalf + salaryProfile.amountUse; + : salaryRanks.salaryHalf; } else if (body.type == "FULL") { salaryProfile.amountSpecial = salaryRanks == null || salaryRanks.salaryFullSpecial == null @@ -518,11 +518,11 @@ export class SalaryPeriodController extends Controller { salaryRanks.salaryFull == null || salaryProfile.amount == null ? 0 - : salaryRanks.salaryFull - salaryProfile.amount; + : salaryRanks.salaryFull - salaryProfile.amount + salaryRanks.salaryFullSpecial; salaryProfile.positionSalaryAmount = salaryRanks == null || salaryRanks.salaryFull == null ? 0 - : salaryRanks.salaryFull + salaryProfile.amountUse; + : salaryRanks.salaryFull; } else if (body.type == "FULLHAFT") { salaryProfile.amountSpecial = salaryRanks == null || salaryRanks.salaryFullHalfSpecial == null @@ -534,11 +534,11 @@ export class SalaryPeriodController extends Controller { salaryRanks.salaryFullHalf == null || salaryProfile.amount == null ? 0 - : salaryRanks.salaryFullHalf - salaryProfile.amount; + : salaryRanks.salaryFullHalf - salaryProfile.amount + salaryRanks.salaryFullHalfSpecial; salaryProfile.positionSalaryAmount = salaryRanks == null || salaryRanks.salaryFullHalf == null ? 0 - : salaryRanks.salaryFullHalf + salaryProfile.amountUse; + : salaryRanks.salaryFullHalf; } else { throw new HttpError(HttpStatusCode.NOT_FOUND, "ประเภทการเลื่อนขึ้นเงินเดือนไม่ถูกต้อง"); } @@ -745,7 +745,7 @@ export class SalaryPeriodController extends Controller { salaryProfile.amountSpecial = 0; salaryProfile.amountUse = 0; salaryProfile.positionSalaryAmount = - salaryProfile.amount == null ? 0 : salaryProfile.amount + salaryProfile.amountUse; + salaryProfile.amount == null ? 0 : salaryProfile.amount; } else if (salaryProfile.type == "PENDING") { salaryProfile.amountSpecial = 0; salaryProfile.amountUse = 0; @@ -761,11 +761,11 @@ export class SalaryPeriodController extends Controller { salaryRanks.salaryHalf == null || salaryProfile.amount == null ? 0 - : salaryRanks.salaryHalf - salaryProfile.amount; + : salaryRanks.salaryHalf - salaryProfile.amount + salaryRanks.salaryHalfSpecial; salaryProfile.positionSalaryAmount = salaryRanks == null || salaryRanks.salaryHalf == null ? 0 - : salaryRanks.salaryHalf + salaryProfile.amountUse; + : salaryRanks.salaryHalf; } else if (salaryProfile.type == "FULL") { salaryProfile.amountSpecial = salaryRanks == null || salaryRanks.salaryFullSpecial == null @@ -777,11 +777,11 @@ export class SalaryPeriodController extends Controller { salaryRanks.salaryFull == null || salaryProfile.amount == null ? 0 - : salaryRanks.salaryFull - salaryProfile.amount; + : salaryRanks.salaryFull - salaryProfile.amount + salaryRanks.salaryFullSpecial; salaryProfile.positionSalaryAmount = salaryRanks == null || salaryRanks.salaryFull == null ? 0 - : salaryRanks.salaryFull + salaryProfile.amountUse; + : salaryRanks.salaryFull; } else if (salaryProfile.type == "FULLHAFT") { salaryProfile.amountSpecial = salaryRanks == null || salaryRanks.salaryFullHalfSpecial == null @@ -793,11 +793,11 @@ export class SalaryPeriodController extends Controller { salaryRanks.salaryFullHalf == null || salaryProfile.amount == null ? 0 - : salaryRanks.salaryFullHalf - salaryProfile.amount; + : salaryRanks.salaryFullHalf - salaryProfile.amount + salaryRanks.salaryFullHalfSpecial; salaryProfile.positionSalaryAmount = salaryRanks == null || salaryRanks.salaryFullHalf == null ? 0 - : salaryRanks.salaryFullHalf + salaryProfile.amountUse; + : salaryRanks.salaryFullHalf; } else { salaryProfile.amountSpecial = 0; salaryProfile.amountUse = 0;