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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2025-03-27 18:27:52 +07:00
commit 27fe258408
3 changed files with 61 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/controllers/OrganizationController.ts
View file

@ -7564,9 +7564,50 @@ export class OrganizationController extends Controller {
where: {
orgRevision: { orgRevisionIsDraft: false, orgRevisionIsCurrent: true },
},
order: { isDeputy: "DESC", orgRootOrder: "ASC" },
order: { isDeputy: "DESC", DEPARTMENT_CODE: "ASC", orgRootName: "ASC" },
select: ["orgRootName"],
});
const child1 = await this.child1Repository.find({
where: {
orgRevision: { orgRevisionIsDraft: false, orgRevisionIsCurrent: true },
},
order: { orgChild1Order: "ASC" },
select: ["orgChild1Name"],
});
const child2 = await this.child2Repository.find({
where: {
orgRevision: { orgRevisionIsDraft: false, orgRevisionIsCurrent: true },
},
order: { orgChild2Order: "ASC" },
select: ["orgChild2Name"],
});
const child3 = await this.child3Repository.find({
where: {
orgRevision: { orgRevisionIsDraft: false, orgRevisionIsCurrent: true },
},
order: { orgChild3Order: "ASC" },
select: ["orgChild3Name"],
});
const child4 = await this.child4Repository.find({
where: {
orgRevision: { orgRevisionIsDraft: false, orgRevisionIsCurrent: true },
},
order: { orgChild4Order: "ASC" },
select: ["orgChild4Name"],
});
const hospital = await this.child1Repository.find({
where: [
{
orgRevision: { orgRevisionIsDraft: false, orgRevisionIsCurrent: true },
orgRoot: { isDeputy: true },
},
{
orgRevision: { orgRevisionIsDraft: false, orgRevisionIsCurrent: true },
orgChild1RankSub: "HOSPITAL",
},
],
select: ["orgChild1Name"],
});
const posType = await this.posTypeRepository.find({
order: { posTypeRank: "DESC" },
select: ["posTypeName"],
@ -7577,6 +7618,11 @@ export class OrganizationController extends Controller {
});
return new HttpSuccess({
root: root.map((x) => x.orgRootName),
child1: child1.map((x) => x.orgChild1Name),
child2: child2.map((x) => x.orgChild2Name),
child3: child3.map((x) => x.orgChild3Name),
child4: child4.map((x) => x.orgChild4Name),
hospital: hospital.map((x) => x.orgChild1Name),
posTypeNameOrder: posType.map((x) => x.posTypeName),
posLevelNameOrder: posLevel.map((x) => x.posLevelName),
});

8
src/controllers/ProfileController.ts
View file

@ -6128,7 +6128,13 @@ export class ProfileController extends Controller {
}),
)
// .orderBy("current_holders.posMasterNo", "ASC")
.orderBy(`${sortBy}`, sort)
// .orderBy(`${sortBy}`, sort)
.orderBy("orgRoot.orgRootOrder", sort)
.addOrderBy("orgChild1.orgChild1Order", sort)
.addOrderBy("orgChild2.orgChild2Order", sort)
.addOrderBy("orgChild3.orgChild3Order", sort)
.addOrderBy("orgChild4.orgChild4Order", sort)
.addOrderBy("current_holders.posMasterNo", sort)
.skip((page - 1) * pageSize)
.take(pageSize)
.getManyAndCount();

8
src/controllers/ProfileEmployeeController.ts
View file

@ -2297,7 +2297,13 @@ export class ProfileEmployeeController extends Controller {
// orgRevisionId: findRevision.id,
// })
// .orderBy("current_holders.posMasterNo", "ASC")
.orderBy(`${sortBy}`, sort)
// .orderBy(`${sortBy}`, sort)
.orderBy("orgRoot.orgRootOrder", sort)
.addOrderBy("orgChild1.orgChild1Order", sort)
.addOrderBy("orgChild2.orgChild2Order", sort)
.addOrderBy("orgChild3.orgChild3Order", sort)
.addOrderBy("orgChild4.orgChild4Order", sort)
.addOrderBy("current_holders.posMasterNo", sort)
.skip((page - 1) * pageSize)
.take(pageSize)
.getManyAndCount();