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

#1009 , #1016 , #1022 ,#1014, #1051

Browse source
This commit is contained in:
AdisakKanthawilang 2025-01-23 16:29:20 +07:00
parent bced954d05
commit 2acd1ac237
1 changed files with 42 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

75
src/controllers/ReportController.ts
View file

@ -2375,7 +2375,7 @@ export class ReportController extends Controller {
item.amountSpecial == undefined || item.amountSpecial == null item.amountSpecial == undefined || item.amountSpecial == null
? "๐" ? "๐"
: Extension.ToThaiNumber(String(item.amountSpecial.toLocaleString())), : Extension.ToThaiNumber(String(item.amountSpecial.toLocaleString())),
remark: item.remark ?? null, remark: item.remark ?? "",
})); }));
const profileNoAmount = salaryProfileNoAmount.map((item, index) => ({ const profileNoAmount = salaryProfileNoAmount.map((item, index) => ({
@ -2397,7 +2397,7 @@ export class ReportController extends Controller {
item.amount == undefined || item.amount == null item.amount == undefined || item.amount == null
? "๐" ? "๐"
: Extension.ToThaiNumber(String(item.amount.toLocaleString())), : Extension.ToThaiNumber(String(item.amount.toLocaleString())),
remark: item.remark ?? null, remark: item.remark ?? "",
})); }));
return new HttpSuccess({ return new HttpSuccess({
@ -2440,6 +2440,7 @@ export class ReportController extends Controller {
relations: ["salaryPeriod", "salaryProfiles"], relations: ["salaryPeriod", "salaryProfiles"],
where: { where: {
snapshot: "SNAP2", snapshot: "SNAP2",
group: "GROUP1",
rootId: rootId, rootId: rootId,
salaryPeriodId: salaryPeriodId, salaryPeriodId: salaryPeriodId,
}, },
@ -2972,16 +2973,16 @@ export class ReportController extends Controller {
position: profile.position, position: profile.position,
posLevel: profile.posLevel posLevel: profile.posLevel
? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}` ? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
: null, : "-",
posNumber: posNumber: profile.orgShortName || profile.posMasterNo ?
Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.orgShortName) +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()), Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()):"-",
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null, amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
positionSalaryAmount: profile.positionSalaryAmount positionSalaryAmount: profile.positionSalaryAmount
? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString()) ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
: null, : "-",
reasonSign: null, reasonSign: "-",
score: profile.result, //สรุปผลการประเมินฯ ระดับและคะแนน score: profile.result??"-", //สรุปผลการประเมินฯ ระดับและคะแนน
reason: profile.remark, //เหตุผลที่ไม่สมควรหรือไม่อาจเลื่อนขั้นค่าจ้าง reason: profile.remark, //เหตุผลที่ไม่สมควรหรือไม่อาจเลื่อนขั้นค่าจ้าง
}; };
}); });
@ -5710,31 +5711,37 @@ export class ReportController extends Controller {
const affiliation = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
const positionParts = [
profile.position,
profile.child4,
profile.child3,
profile.child2,
profile.child1,
profile.root,
];
const position = positionParts
.filter((part) => part !== undefined && part !== null)
.join("/");
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`; const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
return { return {
no: Extension.ToThaiNumber((index + 1).toLocaleString()), no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullName: fullName, fullName: fullName,
affiliation: affiliation, affiliation: affiliation,
position: position: position,
profile.position +
"/" +
(profile.child4 == undefined && profile.child4 == null ? "" : profile.child4 + "/") +
(profile.child3 == undefined && profile.child3 == null ? "" : profile.child3 + "/") +
(profile.child2 == undefined && profile.child2 == null ? "" : profile.child2 + "/") +
(profile.child1 == undefined && profile.child1 == null ? "" : profile.child1 + "/") +
(profile.root == undefined && profile.root == null ? "" : profile.root),
posLevel: profile.posLevel posLevel: profile.posLevel
? Extension.ToThaiNumber(profile.posLevel.toLocaleString()) ? Extension.ToThaiNumber(profile.posLevel.toLocaleString())
: null, : "-",
posNumber: posNumber:
Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.orgShortName) +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()), Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null, amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
positionSalaryAmount: profile.positionSalaryAmount positionSalaryAmount: profile.positionSalaryAmount
? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString()) ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
: null, : "-",
reason: null, reason: profile.remark??null,
}; };
}); });
@ -5907,14 +5914,14 @@ export class ReportController extends Controller {
no: Extension.ToThaiNumber((index + 1).toLocaleString()), no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullName: fullName, fullName: fullName,
affiliation: affiliation, affiliation: affiliation,
position: profile.position, position: profile.position??"-",
posLevel: profile.posLevel posLevel: profile.posLevel
? Extension.ToThaiNumber(profile.posLevel.toLocaleString()) ? Extension.ToThaiNumber(profile.posLevel.toLocaleString())
: null, : "-",
posNumber: posNumber:
Extension.ToThaiNumber(profile.orgShortName) + profile.orgShortName || profile.posMasterNo? Extension.ToThaiNumber(profile.orgShortName) +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()), Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()):"-",
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null, amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
reason: null, reason: null,
}; };
}); });
@ -6239,21 +6246,21 @@ export class ReportController extends Controller {
return { return {
no: Extension.ToThaiNumber((index + 1).toLocaleString()), no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullName: fullName, fullName: fullName??"-",
affiliation: affiliation, affiliation: affiliation??"-",
position: profile.position, position: profile.position??"-",
posLevel: profile.posLevel posLevel: profile.posLevel
? Extension.ToThaiNumber(profile.posLevel.toLocaleString()) ? Extension.ToThaiNumber(profile.posLevel.toLocaleString())
: null, : "-",
posNumber: posNumber:
Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.orgShortName) +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()), Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null, amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
positionSalaryAmount: profile.positionSalaryAmount positionSalaryAmount: profile.positionSalaryAmount
? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString()) ? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
: null, : "-",
amountUseOld: amountUseOld ? Extension.ToThaiNumber(amountUseOld.toLocaleString()) : null, amountUseOld: amountUseOld ? Extension.ToThaiNumber(amountUseOld.toLocaleString()) : "-",
amountUse: amountUse ? Extension.ToThaiNumber(amountUse.toLocaleString()) : null, amountUse: amountUse ? Extension.ToThaiNumber(amountUse.toLocaleString()) : "-",
reason: null, reason: null,
}; };
}); });