hrms-bangkok/hrms-api-salary
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

no message

Browse source
This commit is contained in:
Kittapath 2024-03-29 14:02:07 +07:00
parent dfa0fda87a
commit 885b5198a7
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/SalaryPeriodController.ts
View file

@ -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:

2
src/controllers/SalaryPeriodEmployeeController.ts
View file

@ -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,