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

no message

Browse source
This commit is contained in:
Kittapath 2024-02-06 11:30:21 +07:00
parent 02c42c2068
commit d7196fc033
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/controllers/ReportController.ts
View file

@ -170,6 +170,7 @@ export class ReportController extends Controller {
"posMaster.orgChild2Id", "posMaster.orgChild2Id",
"posMaster.orgChild3Id", "posMaster.orgChild3Id",
"posMaster.orgChild4Id", "posMaster.orgChild4Id",
"posMaster.next_holder",
]) ])
.orderBy("posMaster.posMasterOrder", "ASC") .orderBy("posMaster.posMasterOrder", "ASC")
.getMany(); .getMany();
@ -179,6 +180,16 @@ export class ReportController extends Controller {
}, },
relations: ["posLevel", "posType", "posExecutive"], relations: ["posLevel", "posType", "posExecutive"],
}); });
let orgRevisionActive: any = await this.orgRevisionRepository.findOne({
where: { orgRevisionIsCurrent: true, orgRevisionIsDraft: false },
});
if (orgRevisionActive == null) {
const _orgRevisionActive = await this.orgRevisionRepository.find({
order: { orgRevisionCreatedAt: "DESC" },
skip: 1,
});
if (_orgRevisionActive.length > 0) orgRevisionActive = _orgRevisionActive[0];
}
let data = new Array(); let data = new Array();
await Promise.all( await Promise.all(
@ -195,6 +206,8 @@ export class ReportController extends Controller {
posMasterNoPrefix: posMaster.posMasterNoPrefix, posMasterNoPrefix: posMaster.posMasterNoPrefix,
posMasterNo: posMaster.posMasterNo, posMasterNo: posMaster.posMasterNo,
posMasterNoSuffix: posMaster.posMasterNoSuffix, posMasterNoSuffix: posMaster.posMasterNoSuffix,
fullname: `${posMaster.next_holder}`,
// fullname: `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
positions: await Promise.all( positions: await Promise.all(
positions positions
.filter((position) => position.posMasterId === posMaster.id) .filter((position) => position.posMasterId === posMaster.id)