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

#1648 , #1649 , #1650

Browse source
This commit is contained in:
AdisakKanthawilang 2025-07-18 16:10:55 +07:00
parent 76d5f07f08
commit bae73b9896
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/controllers/ReportController.ts
View file

@ -687,7 +687,7 @@ export class ReportController extends Controller {
"posMasters.positions.posExecutive", "posMasters.positions.posExecutive",
], ],
}); });
const orgName = orgRootData[0].orgRootName??"";
const orgRootIds = orgRootData.map((orgRoot) => orgRoot.id) || null; const orgRootIds = orgRootData.map((orgRoot) => orgRoot.id) || null;
const orgChild1Data = await this.child1Repository.find({ const orgChild1Data = await this.child1Repository.find({
where: { where: {
@ -1285,8 +1285,8 @@ export class ReportController extends Controller {
} }
} }
} }
return new HttpSuccess({ template: "report1", reportName: "report1", data: { data } }); return new HttpSuccess({ template: "report1", reportName: "report1", data: { org: orgName,data } });
} }
/** /**
@ -1338,7 +1338,7 @@ export class ReportController extends Controller {
"posMasters.positions.posExecutive", "posMasters.positions.posExecutive",
], ],
}); });
const orgName = orgRootData[0].orgRootName??"";
const orgRootIds = orgRootData.map((orgRoot) => orgRoot.id) || null; const orgRootIds = orgRootData.map((orgRoot) => orgRoot.id) || null;
const orgChild1Data = await this.child1Repository.find({ const orgChild1Data = await this.child1Repository.find({
where: { where: {
@ -3459,7 +3459,7 @@ export class ReportController extends Controller {
// sendWebSocket(metaData); // sendWebSocket(metaData);
// })(); // })();
return new HttpSuccess({ template: "report2", reportName: "report2", data: { data } }); return new HttpSuccess({ template: "report2", reportName: "report2", data: { org: orgName ,data } });
} }
/** /**
@ -5697,7 +5697,7 @@ export class ReportController extends Controller {
"posMasters.positions.posExecutive", "posMasters.positions.posExecutive",
], ],
}); });
const orgName = orgRootData[0].orgRootName??"";
const orgRootIds = orgRootData.map((orgRoot) => orgRoot.id) || null; const orgRootIds = orgRootData.map((orgRoot) => orgRoot.id) || null;
const orgChild1Data = await this.child1Repository.find({ const orgChild1Data = await this.child1Repository.find({
where: { where: {
@ -6888,7 +6888,7 @@ export class ReportController extends Controller {
} }
} }
} }
return new HttpSuccess({ template: "report3", reportName: "report3", data: { data } }); return new HttpSuccess({ template: "report3", reportName: "report3", data: { org: orgName,data } });
} }
@Get("report4/{rootId}") @Get("report4/{rootId}")