From 2b72ad39c994abcb2ddff19504a2c68ca26fc145 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Fri, 26 Apr 2024 14:41:55 +0700 Subject: [PATCH 1/2] =?UTF-8?q?=E0=B8=9C=E0=B8=B9=E0=B9=89=E0=B8=9A?= =?UTF-8?q?=E0=B8=B1=E0=B8=87=E0=B8=84=E0=B8=B1=E0=B8=9A=E0=B8=9B=E0=B8=B1?= =?UTF-8?q?=E0=B8=8D=E0=B8=8A=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ProfileController.ts | 57 ++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 041027fb..b3723fb1 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -103,6 +103,63 @@ export class ProfileController extends Controller { })); return new HttpSuccess({ caregiver, commander, chairman }); } + /** + * + * + */ + @Get("commander") + async getProfileCommander(@Request() request: RequestWithUser) { + const profile = await this.profileRepo.findOne({ + where: { keycloak: request.user.sub }, + }); + + if (!profile) throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล"); + + const _caregiver = await this.profileRepo.find({ + relations: { posLevel: true, posType: true }, + }); + const _commander = await this.profileRepo.find({ + relations: { posLevel: true, posType: true }, + }); + const _chairman = await this.profileRepo.find({ + relations: { posLevel: true, posType: true }, + }); + + const caregiver = _caregiver.map((_data) => ({ + id: _data.id, + prefix: _data.prefix, + firstName: _data.firstName, + lastName: _data.lastName, + citizenId: _data.citizenId, + position: _data.position, + posLevel: _data.posLevel == null ? null : _data.posLevel.posLevelName, + posType: _data.posType == null ? null : _data.posType.posTypeName, + isDirector: true, + })); + const commander = _commander.map((_data) => ({ + id: _data.id, + prefix: _data.prefix, + firstName: _data.firstName, + lastName: _data.lastName, + citizenId: _data.citizenId, + position: _data.position, + posLevel: _data.posLevel == null ? null : _data.posLevel.posLevelName, + posType: _data.posType == null ? null : _data.posType.posTypeName, + isDirector: true, + })); + const chairman = _chairman.map((_data) => ({ + id: _data.id, + prefix: _data.prefix, + firstName: _data.firstName, + lastName: _data.lastName, + citizenId: _data.citizenId, + position: _data.position, + posLevel: _data.posLevel == null ? null : _data.posLevel.posLevelName, + posType: _data.posType == null ? null : _data.posType.posTypeName, + isDirector: true, + })); + return new HttpSuccess({ caregiver, commander, chairman }); + } /** * API สร้างทะเบียนประวัติ From 63bd67574082c47db7ed060d22e7ac425cf5dbc7 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Fri, 26 Apr 2024 15:00:35 +0700 Subject: [PATCH 2/2] fix edit --- src/controllers/PositionController.ts | 45 +++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts index f85d4706..241a6219 100644 --- a/src/controllers/PositionController.ts +++ b/src/controllers/PositionController.ts @@ -841,6 +841,7 @@ export class PositionController extends Controller { where: { orgChild3: { orgChild3ShortName: SName }, posMasterNo: requestBody.posMasterNo, + orgChild4Id: IsNull(), id: Not(posMaster.id), }, }); @@ -855,6 +856,7 @@ export class PositionController extends Controller { where: { orgChild2: { orgChild2ShortName: SName }, posMasterNo: requestBody.posMasterNo, + orgChild3Id: IsNull(), id: Not(posMaster.id), }, }); @@ -869,6 +871,7 @@ export class PositionController extends Controller { where: { orgChild1: { orgChild1ShortName: SName }, posMasterNo: requestBody.posMasterNo, + orgChild2Id: IsNull(), id: Not(posMaster.id), }, }); @@ -883,6 +886,7 @@ export class PositionController extends Controller { where: { orgRoot: { orgRootShortName: SName }, posMasterNo: requestBody.posMasterNo, + orgChild1Id: IsNull(), id: Not(posMaster.id), }, }); @@ -1736,6 +1740,47 @@ export class PositionController extends Controller { posMaster.orgRevisionId = org.orgRevisionId; } } + // let org = null; + // let repo = null; + + // switch (requestBody.type) { + // case 1: + // repo = this.child1Repository; + // break; + // case 2: + // repo = this.child2Repository; + // break; + // case 3: + // repo = this.child3Repository; + // break; + // case 4: + // repo = this.child4Repository; + // break; + // default: + // throw new Error('Invalid type'); + // } + + // org = await repo.findOne({ where: { id: requestBody.id } }); + + // if (org != null) { + // const posMasterCheck = await this.posMasterRepository.findOne({ + // where: { + // [`orgChild${requestBody.type}Id`]: org.id, + // posMasterNo: posMaster.posMasterNo, + // orgChild2Id: (requestBody.type > 1) ? IsNull() : undefined, + // orgChild3Id: (requestBody.type > 2) ? IsNull() : undefined, + // orgChild4Id: (requestBody.type > 3) ? IsNull() : undefined, + // }, + // }); + + // if (posMasterCheck != null) { + // throw new HttpError( + // HttpStatusCode.NOT_FOUND, + // `เลขที่ตำแหน่งมีอยู่ในระบบอยู่แล้ว`, + // ); + // } + // } + if (change == true) { posMaster.posMasterOrder = maxPosMasterOrder += 1; posMaster.createdUserId = request.user.sub;