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

#2474
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m1s
Details

Browse source
This commit is contained in:
Adisak 2026-05-11 16:48:04 +07:00
parent 378c941a01
commit 7e4dc6434f
3 changed files with 1252 additions and 1261 deletions
Download patch file Download diff file Expand all files Collapse all files

2459
src/controllers/ProfileController.ts
View file

File diff suppressed because it is too large Load diff

40
src/controllers/ProfileEmployeeController.ts
View file

@ -3368,31 +3368,21 @@ export class ProfileEmployeeController extends Controller {
.getManyAndCount(); .getManyAndCount();
const data = await Promise.all( const data = await Promise.all(
record.map((_data) => { record.map((_data) => {
const shortName = const holder = _data.current_holders.find((x) => x.orgRevisionId == findRevision.id);
_data.current_holders.length == 0 const numPart = holder ? `${holder.posMasterNoPrefix ?? ''}${holder.posMasterNo ?? ''}${holder.posMasterNoSuffix ?? ''}` : '';
? null const shortName = !holder
: _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null && ? null
_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4 != : holder.orgChild4 != null
null ? `${holder.orgChild4.orgChild4ShortName} ${numPart}`
? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild4.orgChild4ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}` : holder.orgChild3 != null
: _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null && ? `${holder.orgChild3.orgChild3ShortName} ${numPart}`
_data.current_holders.find((x) => x.orgRevisionId == findRevision.id) : holder.orgChild2 != null
?.orgChild3 != null ? `${holder.orgChild2.orgChild2ShortName} ${numPart}`
? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild3.orgChild3ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}` : holder.orgChild1 != null
: _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null && ? `${holder.orgChild1.orgChild1ShortName} ${numPart}`
_data.current_holders.find((x) => x.orgRevisionId == findRevision.id) : holder.orgRoot != null
?.orgChild2 != null ? `${holder.orgRoot.orgRootShortName} ${numPart}`
? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild2.orgChild2ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}` : null;
: _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) != null &&
_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
?.orgChild1 != null
? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgChild1.orgChild1ShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
: _data.current_holders.find((x) => x.orgRevisionId == findRevision.id) !=
null &&
_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)
?.orgRoot != null
? `${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot.orgRootShortName} ${_data.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.posMasterNo}`
: null;
const dateEmployment = const dateEmployment =
_data.profileEmployeeEmployment.length == 0 _data.profileEmployeeEmployment.length == 0
? null ? null

6
src/controllers/ProfileGovernmentEmployeeController.ts
View file

@ -115,7 +115,7 @@ export class ProfileGovernmentEmployeeController extends Controller {
record.posType == null && record.posLevel == null record.posType == null && record.posLevel == null
? null ? null
: `${record.posType.posTypeShortName} ${record.posLevel.posLevelName}`, //ระดับ : `${record.posType.posTypeShortName} ${record.posLevel.posLevelName}`, //ระดับ
posMasterNo: posMaster == null ? null : `${orgShortName} ${posMaster.posMasterNo}`, //เลขที่ตำแหน่ง posMasterNo: posMaster == null ? null : `${orgShortName} ${posMaster.posMasterNoPrefix ?? ''}${posMaster.posMasterNo ?? ''}${posMaster.posMasterNoSuffix ?? ''}`, //เลขที่ตำแหน่ง
posType: record.posType == null ? null : record.posType.posTypeName, //ประเภท posType: record.posType == null ? null : record.posType.posTypeName, //ประเภท
dateLeave: record.birthDate == null ? null : calculateRetireDate(record.birthDate), dateLeave: record.birthDate == null ? null : calculateRetireDate(record.birthDate),
dateRetireLaw: record.dateRetireLaw ?? null, dateRetireLaw: record.dateRetireLaw ?? null,
@ -281,7 +281,7 @@ export class ProfileGovernmentEmployeeController extends Controller {
record?.isLeave == false record?.isLeave == false
? posMaster == null ? posMaster == null
? null ? null
: `${orgShortName} ${posMaster.posMasterNo}` : `${orgShortName} ${posMaster.posMasterNoPrefix ?? ''}${posMaster.posMasterNo ?? ''}${posMaster.posMasterNoSuffix ?? ''}`
: posNoLeave /*record && record?.profileSalary.length > 0 : posNoLeave /*record && record?.profileSalary.length > 0
? `${record?.profileSalary[0].posNoAbb} ${record?.profileSalary[0].posNo}` ? `${record?.profileSalary[0].posNoAbb} ${record?.profileSalary[0].posNo}`
: null*/, //เลขที่ตำแหน่ง : null*/, //เลขที่ตำแหน่ง
@ -441,7 +441,7 @@ export class ProfileGovernmentEmployeeController extends Controller {
record?.isLeave == false record?.isLeave == false
? posMaster == null ? posMaster == null
? null ? null
: `${orgShortName} ${posMaster.posMasterNo}` : `${orgShortName} ${posMaster.posMasterNoPrefix ?? ''}${posMaster.posMasterNo ?? ''}${posMaster.posMasterNoSuffix ?? ''}`
: posNoLeave /*record && record.profileSalary.length > 0 : posNoLeave /*record && record.profileSalary.length > 0
? `${record?.profileSalary[0].posNoAbb} ${record?.profileSalary[0].posNo}` ? `${record?.profileSalary[0].posNoAbb} ${record?.profileSalary[0].posNo}`
: null*/, //เลขที่ตำแหน่ง : null*/, //เลขที่ตำแหน่ง