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

Merge branch 'develop' into develop-Bright

Browse source
This commit is contained in:
Bright 2024-04-09 11:59:09 +07:00
commit c149234bf9
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/controllers/ReportController.ts
View file

@ -2462,7 +2462,6 @@ export class ReportController extends Controller {
relations: ["salaryOrg", "salaryOrg.salaryPeriod"],
where: {
type: In(["HAFT", "FULL", "FULLHAFT"]),
isNext: false,
salaryOrg: {
snapshot: "SNAP2",
rootId: rootId,
@ -2589,10 +2588,14 @@ export class ReportController extends Controller {
positionSalaryAmount: profile.positionSalaryAmount
? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
: null,
amountSpecial:
amountSpecialFormated:
profile.amountSpecial > 0
? "(" + Extension.ToThaiNumber(profile.amountSpecial.toString()) + ")"
: "",
amountSpecial:
profile.amountSpecial > 0
? Extension.ToThaiNumber(profile.amountSpecial.toString())
: "",
score: null, //สรุปผลการประเมินฯ ระดับและคะแนน
reason: null,
};
@ -5017,7 +5020,7 @@ export class ReportController extends Controller {
no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullName: fullName,
position: profile.position,
posLevel: profile.posLevel,
posLevel: profile.posLevel ? Extension.ToThaiNumber(profile.posLevel.toLocaleString()):null,
};
});