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

Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

Browse source
This commit is contained in:
Kittapath 2024-02-12 15:18:53 +07:00
commit 50205553dd
1 changed files with 45 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

45
src/controllers/PositionController.ts
View file

@ -335,6 +335,13 @@ export class PositionController extends Controller {
if (!orgChild4) { if (!orgChild4) {
throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลโครงสร้าง"); throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลโครงสร้าง");
} else { } else {
const order:any = await this.posMasterRepository.findOne({
where: {
orgChild4Id: orgChild4.id
},
order: { posMasterNo: "DESC" }
})
posMaster.posMasterOrder = order.posMasterOrder == null ? 1: order.posMasterOrder+1
posMaster.orgRootId = orgChild4.orgRootId; posMaster.orgRootId = orgChild4.orgRootId;
posMaster.orgChild1Id = orgChild4.orgChild1Id; posMaster.orgChild1Id = orgChild4.orgChild1Id;
posMaster.orgChild2Id = orgChild4.orgChild2Id; posMaster.orgChild2Id = orgChild4.orgChild2Id;
@ -343,6 +350,14 @@ export class PositionController extends Controller {
posMaster.orgRevisionId = orgChild4.orgRevisionId; posMaster.orgRevisionId = orgChild4.orgRevisionId;
} }
} else { } else {
const order:any = await this.posMasterRepository.findOne({
where: {
orgChild3Id: orgChild3.id,
orgChild4Id: IsNull() || ""
},
order: { posMasterNo: "DESC" }
})
posMaster.posMasterOrder = order.posMasterOrder == null ? 1: order.posMasterOrder+1
posMaster.orgRootId = orgChild3.orgRootId; posMaster.orgRootId = orgChild3.orgRootId;
posMaster.orgChild1Id = orgChild3.orgChild1Id; posMaster.orgChild1Id = orgChild3.orgChild1Id;
posMaster.orgChild2Id = orgChild3.orgChild2Id; posMaster.orgChild2Id = orgChild3.orgChild2Id;
@ -350,17 +365,47 @@ export class PositionController extends Controller {
posMaster.orgRevisionId = orgChild3.orgRevisionId; posMaster.orgRevisionId = orgChild3.orgRevisionId;
} }
} else { } else {
const order:any = await this.posMasterRepository.findOne({
where: {
orgChild2Id: orgChild2.id,
orgChild3Id: IsNull() || "",
orgChild4Id: IsNull() || "",
},
order: { posMasterNo: "DESC" }
})
posMaster.posMasterOrder = order.posMasterOrder == null ? 1: order.posMasterOrder+1
posMaster.orgRootId = orgChild2.orgRootId; posMaster.orgRootId = orgChild2.orgRootId;
posMaster.orgChild1Id = orgChild2.orgChild1Id; posMaster.orgChild1Id = orgChild2.orgChild1Id;
posMaster.orgChild2Id = orgChild2.id; posMaster.orgChild2Id = orgChild2.id;
posMaster.orgRevisionId = orgChild2.orgRevisionId; posMaster.orgRevisionId = orgChild2.orgRevisionId;
} }
} else { } else {
const order:any = await this.posMasterRepository.findOne({
where: {
orgChild1Id: orgChild1.id,
orgChild2Id: IsNull() || "",
orgChild3Id: IsNull() || "",
orgChild4Id: IsNull() || "",
},
order: { posMasterNo: "DESC" }
})
posMaster.posMasterOrder = order.posMasterOrder == null ? 1: order.posMasterOrder+1
posMaster.orgRootId = orgChild1.orgRootId; posMaster.orgRootId = orgChild1.orgRootId;
posMaster.orgChild1Id = orgChild1.id; posMaster.orgChild1Id = orgChild1.id;
posMaster.orgRevisionId = orgChild1.orgRevisionId; posMaster.orgRevisionId = orgChild1.orgRevisionId;
} }
} else { } else {
const order:any = await this.posMasterRepository.findOne({
where: {
orgRootId: orgRoot.id,
orgChild1Id: IsNull() || "",
orgChild2Id: IsNull() || "",
orgChild3Id: IsNull() || "",
orgChild4Id: IsNull() || "",
},
order: { posMasterNo: "DESC" }
})
posMaster.posMasterOrder = order.posMasterOrder == null ? 1: order.posMasterOrder+1
posMaster.orgRootId = orgRoot.id; posMaster.orgRootId = orgRoot.id;
posMaster.orgRevisionId = orgRoot.orgRevisionId; posMaster.orgRevisionId = orgRoot.orgRevisionId;
} }