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

แก้เปอรเซรนเงนพิเศษ

Browse source
This commit is contained in:
Kittapath 2024-03-27 12:11:09 +07:00
parent a6fb4c28f1
commit 94d0412e21
2 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/ReportController.ts
View file

@ -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, // หมายเหตุ

36
src/controllers/SalaryPeriodEmployeeController.ts
View file

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