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

query add type RetirementDeceased

Browse source
This commit is contained in:
kittapath 2025-01-17 11:10:04 +07:00
parent 4dcaa92f63
commit bf4d551f40
4 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/controllers/ProfileEmployeeController.ts
View file

@ -1943,7 +1943,10 @@ export class ProfileEmployeeController extends Controller {
firstName: _data.firstName, firstName: _data.firstName,
lastName: _data.lastName, lastName: _data.lastName,
citizenId: _data.citizenId, citizenId: _data.citizenId,
posLevel: _data.posLevel == null ? null : _data.posLevel.posLevelName, posLevel:
_data.posLevel == null
? null
: `${_data?.posType?.posTypeShortName ?? ""} ${_data?.posLevel?.posLevelName ?? ""}`,
posType: _data.posType == null ? null : _data.posType.posTypeName, posType: _data.posType == null ? null : _data.posType.posTypeName,
position: _data.position, position: _data.position,
})); }));

5
src/controllers/ProfileEmployeeTempController.ts
View file

@ -1759,7 +1759,10 @@ export class ProfileEmployeeTempController extends Controller {
firstName: _data.firstName, firstName: _data.firstName,
lastName: _data.lastName, lastName: _data.lastName,
citizenId: _data.citizenId, citizenId: _data.citizenId,
posLevel: _data.posLevel == null ? null : _data.posLevel.posLevelName, posLevel:
_data.posLevel == null
? null
: `${_data?.posType?.posTypeShortName ?? ""} ${_data?.posLevel?.posLevelName ?? ""}`,
posType: _data.posType == null ? null : _data.posType.posTypeName, posType: _data.posType == null ? null : _data.posType.posTypeName,
position: _data.position, position: _data.position,
})); }));

2
src/controllers/ProfileGovernmentEmployeeController.ts
View file

@ -215,7 +215,7 @@ export class ProfileGovernmentEmployeeController extends Controller {
posLevel: posLevel:
record.posLevel == 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.posMasterNo}`, //เลขที่ตำแหน่ง
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), //วันเกษียณ

2
src/controllers/ProfileGovernmentEmployeeTempController.ts
View file

@ -205,7 +205,7 @@ export class ProfileGovernmentEmployeeTempController extends Controller {
posLevel: posLevel:
record.posLevel == 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.posMasterNo}`, //เลขที่ตำแหน่ง
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), //วันเกษียณ