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

fix gov1-04

Browse source
This commit is contained in:
AdisakKanthawilang 2024-03-20 20:34:23 +07:00
parent 1b2e4239f5
commit 31faf3b62b
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/controllers/ReportController.ts
View file

@ -1085,6 +1085,7 @@ export class ReportController extends Controller {
fullname: item.prefix + item.firstName + " " + item.lastName,
log_group: item.salaryOrg.group,
log_type: item.type,
log_isNext: item.isNext,
position:
item.position +
"/" +
@ -1103,10 +1104,10 @@ export class ReportController extends Controller {
(item.positionSalaryAmount == undefined || item.positionSalaryAmount == null ? "๐" : Extension.ToThaiNumber(String(item.positionSalaryAmount))) +
(item.amountSpecial == undefined || item.amountSpecial == null ? "๐" : `(${Extension.ToThaiNumber(String(item.amountSpecial))})`),
score: null, //สรุปผลการประเมินฯ ระดับและคะแนน
remark:
`${item.type == "FULL" ? "" : "หนึ่งขั้น"}\n` +
`${item.amountSpecial != 0 ? "" : "ได้รับค่าตอบแทนพิเศษ"}\n` +
`${item.isNext == true ? "" : "(ได้รับเงินเดือนสูงกว่าขั้นสูงฯ)"}`, // หมายเหตุ
remark:
`${item.type === "FULL" ? "หนึ่งขั้น" : ""}\n` +
`${(item.type === "FULL" && item.amountSpecial == 0 && item.amountSpecial == null && item.amountSpecial == undefined) ? "ได้รับค่าตอบแทนพิเศษ\n" : ""}` +
`${(item.type === "FULL" && item.isNext === true) ? "(ได้รับเงินเดือนสูงกว่าขั้นสูงฯ)" : ""}`, // หมายเหตุ
})),
},
});