diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts index ed6a622..5d9336b 100644 --- a/src/controllers/SalaryPeriodController.ts +++ b/src/controllers/SalaryPeriodController.ts @@ -159,10 +159,10 @@ export class SalaryPeriodController extends Controller { total: item.total + (_salaryOrgGROUP2 == null ? 0 : _salaryOrgGROUP2.total), fifteenPercent: item.fifteenPercent + - item.fifteenPoint + + item.fifteenPoint / 100 + (_salaryOrgGROUP2 == null ? 0 - : _salaryOrgGROUP2.fifteenPercent + _salaryOrgGROUP2.fifteenPoint), + : _salaryOrgGROUP2.fifteenPercent + _salaryOrgGROUP2.fifteenPoint / 100), chosen: item.quantityUsed + (_salaryOrgGROUP2 == null ? 0 : _salaryOrgGROUP2.quantityUsed), remaining: diff --git a/src/controllers/SalaryPeriodEmployeeController.ts b/src/controllers/SalaryPeriodEmployeeController.ts index e05513c..99cca8d 100644 --- a/src/controllers/SalaryPeriodEmployeeController.ts +++ b/src/controllers/SalaryPeriodEmployeeController.ts @@ -140,7 +140,7 @@ export class SalaryPeriodEmployeeController extends Controller { const data = { org: item.root, total: item.total, - fifteenPercent: item.fifteenPercent, + fifteenPercent: item.fifteenPercent + item.fifteenPoint / 100, chosen: item.quantityUsed, remaining: item.remainQuota, currentAmount: item.currentAmount,