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

fix sit #1071

Browse source
This commit is contained in:
Bright 2025-01-31 15:18:08 +07:00
parent 0ec82cf1ba
commit 38bb51f491
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/controllers/ReportController.ts
View file

@ -6489,6 +6489,7 @@ export class ReportController extends Controller {
typeRank: [...new Set(x.positions.flatMap((y) => y.posType.posTypeRank))].join(""), typeRank: [...new Set(x.positions.flatMap((y) => y.posType.posTypeRank))].join(""),
level: [...new Set(x.positions.flatMap((y) => y.posLevel.posLevelName))].join(","), level: [...new Set(x.positions.flatMap((y) => y.posLevel.posLevelName))].join(","),
levelRank: [...new Set(x.positions.flatMap((y) => `${y.posType.posTypeRank}${y.posLevel.posLevelRank}`))].join(""), levelRank: [...new Set(x.positions.flatMap((y) => `${y.posType.posTypeRank}${y.posLevel.posLevelRank}`))].join(""),
positions: [...new Set(x.positions.flatMap((y) => y.positionName))].join(""),
})) }))
const groupedData = _posMaster.reduce((acc:any, curr:any) => { const groupedData = _posMaster.reduce((acc:any, curr:any) => {
@ -6508,7 +6509,7 @@ export class ReportController extends Controller {
level: x.level, level: x.level,
levelRank: parseInt(x.levelRank), levelRank: parseInt(x.levelRank),
total: x.total, total: x.total,
remark: "", remark: x.positions,
})) }))
.sort((x, y) => { .sort((x, y) => {
if (x.typeRank !== y.typeRank) { if (x.typeRank !== y.typeRank) {