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

fix report

Browse source
This commit is contained in:
AdisakKanthawilang 2025-04-09 10:55:48 +07:00
parent 72772072bb
commit 9ffd131632
1 changed files with 39 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/controllers/ReportController.ts
View file

@ -207,6 +207,7 @@ export class ReoportController {
"certificate.issueDate",
"certificate.expireDate",
"salaries.date",
"salaries.amount",
"salaries.positionSalaryAmount",
@ -218,6 +219,33 @@ export class ReoportController {
"salaries.refCommandNo",
"salaries.refCommandDate",
"salaries.salaryStatus",
"salaries.profileId",
"salaries.commandCode",
"salaries.commandNo",
"salaries.commandYear",
"salaries.commandDateAffect",
"salaries.commandDateSign",
"salaries.posNoAbb",
"salaries.positionName",
"salaries.positionType",
"salaries.positionLevel",
"salaries.positionLine",
"salaries.positionPathSide",
"salaries.positionExecutive",
"salaries.amountSpecial",
"salaries.orgRoot",
"salaries.orgChild1",
"salaries.orgChild2",
"salaries.orgChild3",
"salaries.orgChild4",
"salaries.remark",
"salaries.commandId",
"salaries.isGovernment",
"salaries.positionCee",
"salaries.commandName",
"salaries.posNumCodeSit",
"salaries.posNumCodeSitAbb",
"salaries.isEntry",
"training.name",
"training.topic",
@ -238,6 +266,7 @@ export class ReoportController {
"assessment.pointSumTotal",
"assessment.pointSum",
])
.orderBy("salaries.commandDateAffect", "DESC")
.getOne();
if (!evaluation) {
@ -343,10 +372,10 @@ export class ReoportController {
? `(${Extension.ToThaiNumber(
Extension.ToThaiShortDate(education.finishDate).toString(),
)})`
: "-",
: "",
isEducation: education.isEducation,
degree: education.degree ? Extension.ToThaiNumber(education.degree) : "-",
field: education.field ? `(${Extension.ToThaiNumber(education.field)})` : "-",
field: education.field ? `(${Extension.ToThaiNumber(education.field)})` : "",
fundName: education.fundName,
gpa: education.gpa,
country: education.country,
@ -389,13 +418,13 @@ export class ReoportController {
salaries:
evaluation.salaries.length > 0
? evaluation.salaries.map((salaries) => ({
date: salaries.date
? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(salaries.date))
date: salaries.commandDateAffect
? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(salaries.commandDateAffect))
: "-",
amount: salaries.amount
? Extension.ToThaiNumber(salaries.amount.toLocaleString())
: "-",
position: salaries.position ? Extension.ToThaiNumber(salaries.position) : "-",
position: salaries.positionName ? Extension.ToThaiNumber(salaries.positionName) : "-",
positionSalaryAmount: salaries.positionSalaryAmount,
mouthSalaryAmount: salaries.mouthSalaryAmount,
posNo: salaries.posNo,
@ -404,6 +433,11 @@ export class ReoportController {
refCommandNo: salaries.refCommandNo,
refCommandDate: salaries.refCommandDate,
salaryStatus: salaries.salaryStatus,
org: (salaries.orgChild4 ? salaries.orgChild4 + "\n" : "") +
(salaries.orgChild3 ? salaries.orgChild3 + "\n" : "") +
(salaries.orgChild2 ? salaries.orgChild2 + "\n" : "") +
(salaries.orgChild1 ? salaries.orgChild1 + "\n" : "") +
(salaries.orgRoot ? salaries.orgRoot : ""),
}))
: [
{