hrms-bangkok/hrms-api-salary
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 2024-07-08 16:58:53 +07:00
parent 229c1a8e4d
commit b59bcc9163
1 changed files with 54 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

91
src/controllers/ReportController.ts
View file

@ -2307,7 +2307,7 @@ export class ReportController extends Controller {
relations: ["salaryOrg"], relations: ["salaryOrg"],
where: { where: {
salaryOrgId: In([salaryOrg?.id]), salaryOrgId: In([salaryOrg?.id]),
amountSpecial: MoreThan(1), amountSpecial: MoreThan(0),
}, },
select: [ select: [
"id", "id",
@ -2383,7 +2383,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: null, remark: item.remark ?? null,
})); }));
const profileNoAmount = salaryProfileNoAmount.map((item, index) => ({ const profileNoAmount = salaryProfileNoAmount.map((item, index) => ({
@ -2405,7 +2405,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: null, remark: item.remark ?? null,
})); }));
return new HttpSuccess({ return new HttpSuccess({
@ -2534,16 +2534,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
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,
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())}`
@ -2618,16 +2619,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
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,
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())}`
@ -2702,16 +2704,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
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,
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())}`
@ -2783,16 +2786,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
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,
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())}`
@ -2869,16 +2873,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
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,
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())}`
@ -2950,16 +2955,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
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,
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())}`
@ -3088,16 +3094,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
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,
position: profile.position, position: profile.position,
posNumber: posNumber:
Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.orgShortName) +
@ -3228,16 +3235,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
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,
position: profile.position, position: profile.position,
posLevel: profile.posLevel posLevel: profile.posLevel
? Extension.ToThaiNumber(String(profile.posLevel.toLocaleString())) ? Extension.ToThaiNumber(String(profile.posLevel.toLocaleString()))
@ -3374,16 +3382,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
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,
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())}`
@ -3458,16 +3467,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
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,
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())}`
@ -3536,16 +3546,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
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,
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())}`
@ -3612,16 +3623,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
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,
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())}`
@ -4089,16 +4101,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
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,
position: profile.position, position: profile.position,
posNumber: posNumber:
Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.orgShortName) +
@ -4316,16 +4329,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
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,
position: profile.position, position: profile.position,
posLevel: Extension.ToThaiNumber(profile.posLevel.toLocaleString()), posLevel: Extension.ToThaiNumber(profile.posLevel.toLocaleString()),
posNumber: posNumber:
@ -4473,16 +4487,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
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,
position: position:
profile.position + profile.position +
"/" + "/" +
@ -4566,16 +4581,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
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,
position: profile.position, position: profile.position,
posLevel: profile.posLevel, posLevel: profile.posLevel,
posNumber: posNumber:
@ -4653,16 +4669,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
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,
position: position:
profile.position + profile.position +
"/" + "/" +