From 30a8052f831244842ff317d271ccacf4c490cc1b Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Tue, 5 Mar 2024 13:32:57 +0700
Subject: [PATCH] no message

---
 src/controllers/SalaryPeriodController.ts | 32 +++++++++++------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts
index e63ea12..458b2d4 100644
--- a/src/controllers/SalaryPeriodController.ts
+++ b/src/controllers/SalaryPeriodController.ts
@@ -171,7 +171,7 @@ export class SalaryPeriodController extends Controller {
           .select("SUM(salaryProfile.amountUse)", "totalAmount")
           .where({
             salaryOrgId: salaryProfile?.salaryOrg.id,
-            type: "FULL",
+            type: In(["HAFT", "FULL", "FULLHAFT"]),
           })
           .getRawOne();
         const calRemainAmount =
@@ -247,9 +247,7 @@ export class SalaryPeriodController extends Controller {
       salaryProfile.amountSpecial = 0;
       salaryProfile.amountUse = 0;
       salaryProfile.positionSalaryAmount =
-        salaryProfile.amount == null
-          ? 0
-          : salaryProfile.amount + salaryProfile.amountUse - salaryProfile.amountSpecial;
+        salaryProfile.amount == null ? 0 : salaryProfile.amount + salaryProfile.amountUse;
     } else if (salaryProfile.type == "PENDING") {
       salaryProfile.amountSpecial = 0;
       salaryProfile.amountUse = 0;
@@ -265,7 +263,7 @@ export class SalaryPeriodController extends Controller {
         salaryRanks.salaryHalf == null ||
         salaryProfile.amount == null
           ? 0
-          : salaryRanks.salaryHalf - salaryProfile.amount - salaryProfile.amountSpecial;
+          : salaryRanks.salaryHalf - salaryProfile.amount;
       salaryProfile.positionSalaryAmount =
         salaryRanks == null || salaryRanks.salaryHalf == null
           ? 0
@@ -281,7 +279,7 @@ export class SalaryPeriodController extends Controller {
         salaryRanks.salaryFull == null ||
         salaryProfile.amount == null
           ? 0
-          : salaryRanks.salaryFull - salaryProfile.amount - salaryProfile.amountSpecial;
+          : salaryRanks.salaryFull - salaryProfile.amount;
       salaryProfile.positionSalaryAmount =
         salaryRanks == null || salaryRanks.salaryFull == null
           ? 0
@@ -297,7 +295,7 @@ export class SalaryPeriodController extends Controller {
         salaryRanks.salaryFullHalf == null ||
         salaryProfile.amount == null
           ? 0
-          : salaryRanks.salaryFullHalf - salaryProfile.amount - salaryProfile.amountSpecial;
+          : salaryRanks.salaryFullHalf - salaryProfile.amount;
       salaryProfile.positionSalaryAmount =
         salaryRanks == null || salaryRanks.salaryFullHalf == null
           ? 0
@@ -327,7 +325,7 @@ export class SalaryPeriodController extends Controller {
           .select("SUM(salaryProfile.amountUse)", "totalAmount")
           .where({
             salaryOrgId: salaryProfile?.salaryOrg.id,
-            type: "FULL",
+            type: In(["HAFT", "FULL", "FULLHAFT"]),
           })
           .getRawOne();
         const calRemainAmount =
@@ -387,7 +385,7 @@ export class SalaryPeriodController extends Controller {
             .select("SUM(salaryProfile.amountUse)", "totalAmount")
             .where({
               salaryOrgId: salaryOrg.id,
-              type: "FULL",
+              type: In(["HAFT", "FULL", "FULLHAFT"]),
             })
             .getRawOne();
           const calRemainAmount = salaryOrg.sixPercentAmount - sumAmountUse.totalAmount;
@@ -504,7 +502,7 @@ export class SalaryPeriodController extends Controller {
         salaryRanks.salaryHalf == null ||
         salaryProfile.amount == null
           ? 0
-          : salaryRanks.salaryHalf - salaryProfile.amount - salaryProfile.amountSpecial;
+          : salaryRanks.salaryHalf - salaryProfile.amount;
       salaryProfile.positionSalaryAmount =
         salaryRanks == null || salaryRanks.salaryHalf == null
           ? 0
@@ -520,7 +518,7 @@ export class SalaryPeriodController extends Controller {
         salaryRanks.salaryFull == null ||
         salaryProfile.amount == null
           ? 0
-          : salaryRanks.salaryFull - salaryProfile.amount - salaryProfile.amountSpecial;
+          : salaryRanks.salaryFull - salaryProfile.amount;
       salaryProfile.positionSalaryAmount =
         salaryRanks == null || salaryRanks.salaryFull == null
           ? 0
@@ -536,7 +534,7 @@ export class SalaryPeriodController extends Controller {
         salaryRanks.salaryFullHalf == null ||
         salaryProfile.amount == null
           ? 0
-          : salaryRanks.salaryFullHalf - salaryProfile.amount - salaryProfile.amountSpecial;
+          : salaryRanks.salaryFullHalf - salaryProfile.amount;
       salaryProfile.positionSalaryAmount =
         salaryRanks == null || salaryRanks.salaryFullHalf == null
           ? 0
@@ -567,7 +565,7 @@ export class SalaryPeriodController extends Controller {
             .select("SUM(salaryProfile.amountUse)", "totalAmount")
             .where({
               salaryOrgId: salaryProfile.salaryOrg.id,
-              type: "FULL",
+              type: In(["HAFT", "FULL", "FULLHAFT"]),
             })
             .getRawOne();
           const calRemainAmount =
@@ -763,7 +761,7 @@ export class SalaryPeriodController extends Controller {
         salaryRanks.salaryHalf == null ||
         salaryProfile.amount == null
           ? 0
-          : salaryRanks.salaryHalf - salaryProfile.amount - salaryProfile.amountSpecial;
+          : salaryRanks.salaryHalf - salaryProfile.amount;
       salaryProfile.positionSalaryAmount =
         salaryRanks == null || salaryRanks.salaryHalf == null
           ? 0
@@ -779,7 +777,7 @@ export class SalaryPeriodController extends Controller {
         salaryRanks.salaryFull == null ||
         salaryProfile.amount == null
           ? 0
-          : salaryRanks.salaryFull - salaryProfile.amount - salaryProfile.amountSpecial;
+          : salaryRanks.salaryFull - salaryProfile.amount;
       salaryProfile.positionSalaryAmount =
         salaryRanks == null || salaryRanks.salaryFull == null
           ? 0
@@ -795,7 +793,7 @@ export class SalaryPeriodController extends Controller {
         salaryRanks.salaryFullHalf == null ||
         salaryProfile.amount == null
           ? 0
-          : salaryRanks.salaryFullHalf - salaryProfile.amount - salaryProfile.amountSpecial;
+          : salaryRanks.salaryFullHalf - salaryProfile.amount;
       salaryProfile.positionSalaryAmount =
         salaryRanks == null || salaryRanks.salaryFullHalf == null
           ? 0
@@ -832,7 +830,7 @@ export class SalaryPeriodController extends Controller {
           .select("SUM(salaryProfile.amountUse)", "totalAmount")
           .where({
             salaryOrgId: salaryOrg.id,
-            type: "FULL",
+            type: In(["HAFT", "FULL", "FULLHAFT"]),
           })
           .getRawOne();
         const calRemainAmount = salaryOrg.sixPercentAmount - sumAmountUse.totalAmount;