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

#1456

Browse source
This commit is contained in:
AdisakKanthawilang 2025-09-16 15:23:37 +07:00
parent b90e4114a8
commit 8239dfe3bf
1 changed files with 82 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

98
src/controllers/ReportController.ts
View file

@ -761,7 +761,17 @@ export class ReportController extends Controller {
.sort((a, b) => a.posMasterOrder - b.posMasterOrder) .sort((a, b) => a.posMasterOrder - b.posMasterOrder)
.map(async (posMaster) => { .map(async (posMaster) => {
if (posMaster.orgChild1Id == null) { if (posMaster.orgChild1Id == null) {
const positionName = [...new Set(posMaster.positions.map((x) => x.positionName))]; const positionName = [
...new Set(
posMaster.positions
.sort((a:any, b:any) => a.orderNo - b.orderNo)
.map((x) =>
x.positionArea
? `${x.positionName} (${x.positionArea})`
: x.positionName
)
),
];
const posType = [ const posType = [
...new Set( ...new Set(
posMaster.positions posMaster.positions
@ -780,7 +790,11 @@ export class ReportController extends Controller {
...new Set( ...new Set(
posMaster.positions posMaster.positions
.filter((x: any) => x.posExecutive != null) .filter((x: any) => x.posExecutive != null)
.map((x) => x.posExecutive.posExecutiveName), .map((x: any) =>
x.positionExecutiveField
? `${x.posExecutive.posExecutiveName} (${x.positionExecutiveField})`
: x.posExecutive.posExecutiveName
)
), ),
]; ];
@ -867,7 +881,17 @@ export class ReportController extends Controller {
.sort((a, b) => a.posMasterOrder - b.posMasterOrder) .sort((a, b) => a.posMasterOrder - b.posMasterOrder)
.map(async (posMaster) => { .map(async (posMaster) => {
if (posMaster.orgChild2Id == null) { if (posMaster.orgChild2Id == null) {
const positionName = [...new Set(posMaster.positions.map((x) => x.positionName))]; const positionName = [
...new Set(
posMaster.positions
.sort((a:any, b:any) => a.orderNo - b.orderNo)
.map((x) =>
x.positionArea
? `${x.positionName} (${x.positionArea})`
: x.positionName
)
),
];
const posType = [ const posType = [
...new Set( ...new Set(
posMaster.positions posMaster.positions
@ -886,7 +910,11 @@ export class ReportController extends Controller {
...new Set( ...new Set(
posMaster.positions posMaster.positions
.filter((x: any) => x.posExecutive != null) .filter((x: any) => x.posExecutive != null)
.map((x) => x.posExecutive.posExecutiveName), .map((x: any) =>
x.positionExecutiveField
? `${x.posExecutive.posExecutiveName} (${x.positionExecutiveField})`
: x.posExecutive.posExecutiveName
)
), ),
]; ];
@ -975,7 +1003,17 @@ export class ReportController extends Controller {
.sort((a, b) => a.posMasterOrder - b.posMasterOrder) .sort((a, b) => a.posMasterOrder - b.posMasterOrder)
.map(async (posMaster) => { .map(async (posMaster) => {
if (posMaster.orgChild3Id == null) { if (posMaster.orgChild3Id == null) {
const positionName = [...new Set(posMaster.positions.map((x) => x.positionName))]; const positionName = [
...new Set(
posMaster.positions
.sort((a:any, b:any) => a.orderNo - b.orderNo)
.map((x) =>
x.positionArea
? `${x.positionName} (${x.positionArea})`
: x.positionName
)
),
];
const posType = [ const posType = [
...new Set( ...new Set(
posMaster.positions posMaster.positions
@ -990,13 +1028,17 @@ export class ReportController extends Controller {
.map((x) => x.posLevel.posLevelName), .map((x) => x.posLevel.posLevelName),
), ),
]; ];
const posExecutive = [ const posExecutive = [
...new Set( ...new Set(
posMaster.positions posMaster.positions
.filter((x: any) => x.posExecutive != null) .filter((x: any) => x.posExecutive != null)
.map((x) => x.posExecutive.posExecutiveName), .map((x: any) =>
), x.positionExecutiveField
]; ? `${x.posExecutive.posExecutiveName} (${x.positionExecutiveField})`
: x.posExecutive.posExecutiveName
)
),
];
let node = { let node = {
orgTreeName: orgChild2.orgChild2Name, orgTreeName: orgChild2.orgChild2Name,
@ -1081,7 +1123,15 @@ export class ReportController extends Controller {
.map(async (posMaster) => { .map(async (posMaster) => {
if (posMaster.orgChild4Id == null) { if (posMaster.orgChild4Id == null) {
const positionName = [ const positionName = [
...new Set(posMaster.positions.map((x) => x.positionName)), ...new Set(
posMaster.positions
.sort((a:any, b:any) => a.orderNo - b.orderNo)
.map((x) =>
x.positionArea
? `${x.positionName} (${x.positionArea})`
: x.positionName
)
),
]; ];
const posType = [ const posType = [
...new Set( ...new Set(
@ -1101,7 +1151,11 @@ export class ReportController extends Controller {
...new Set( ...new Set(
posMaster.positions posMaster.positions
.filter((x: any) => x.posExecutive != null) .filter((x: any) => x.posExecutive != null)
.map((x) => x.posExecutive.posExecutiveName), .map((x: any) =>
x.positionExecutiveField
? `${x.posExecutive.posExecutiveName} (${x.positionExecutiveField})`
: x.posExecutive.posExecutiveName
)
), ),
]; ];
@ -1187,7 +1241,15 @@ export class ReportController extends Controller {
.sort((a, b) => a.posMasterOrder - b.posMasterOrder) .sort((a, b) => a.posMasterOrder - b.posMasterOrder)
.map(async (posMaster) => { .map(async (posMaster) => {
const positionName = [ const positionName = [
...new Set(posMaster.positions.map((x) => x.positionName)), ...new Set(
posMaster.positions
.sort((a:any, b:any) => a.orderNo - b.orderNo)
.map((x) =>
x.positionArea
? `${x.positionName} (${x.positionArea})`
: x.positionName
)
),
]; ];
const posType = [ const posType = [
...new Set( ...new Set(
@ -1207,7 +1269,11 @@ export class ReportController extends Controller {
...new Set( ...new Set(
posMaster.positions posMaster.positions
.filter((x: any) => x.posExecutive != null) .filter((x: any) => x.posExecutive != null)
.map((x) => x.posExecutive.posExecutiveName), .map((x: any) =>
x.positionExecutiveField
? `${x.posExecutive.posExecutiveName} (${x.positionExecutiveField})`
: x.posExecutive.posExecutiveName
)
), ),
]; ];