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

ชื่อระดับลูกจ้าง

Browse source
This commit is contained in:
mamoss 2025-05-14 23:28:00 +07:00
parent 648baabaf1
commit 03084ca224
1 changed files with 30 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

67
src/controllers/OrganizationDotnetController.ts
View file

@ -677,7 +677,7 @@ export class OrganizationDotnetController extends Controller {
posLevel: posLevel:
(profile.posType == null || profile.posType?.posTypeShortName == null (profile.posType == null || profile.posType?.posTypeShortName == null
? "" ? ""
: profile.posType?.posTypeShortName + " ") + (profile.posLevel?.posLevelName ?? null), : profile.posType?.posTypeShortName + " ") + (profile.posLevel?.posLevelName ?? ""),
posType: profile.posType?.posTypeName ?? null, posType: profile.posType?.posTypeName ?? null,
profileSalary: profile.profileSalary.length > 0 ? profile.profileSalary[0] : null, profileSalary: profile.profileSalary.length > 0 ? profile.profileSalary[0] : null,
profileInsignia: profile.profileInsignias.length > 0 ? profile.profileInsignias[0] : null, profileInsignia: profile.profileInsignias.length > 0 ? profile.profileInsignias[0] : null,
@ -1391,9 +1391,10 @@ export class OrganizationDotnetController extends Controller {
x.orgRevision?.orgRevisionIsCurrent == true, x.orgRevision?.orgRevisionIsCurrent == true,
)?.orgChild4?.ancestorDNA ?? null, )?.orgChild4?.ancestorDNA ?? null,
commander: fullname, commander: fullname,
posLevel: profile.posType?.posTypeShortName && profile.posLevel?.posLevelName posLevel:
? `${profile.posType.posTypeShortName} ${profile.posLevel.posLevelName}` (profile.posType == null || profile.posType?.posTypeShortName == null
: profile.posType?.posTypeShortName || profile.posLevel?.posLevelName || "", ? ""
: profile.posType?.posTypeShortName + " ") + (profile.posLevel?.posLevelName ?? ""),
posType: profile.posType?.posTypeName ?? null, posType: profile.posType?.posTypeName ?? null,
profileSalary: profile.profileSalary.length > 0 ? profile.profileSalary[0] : null, profileSalary: profile.profileSalary.length > 0 ? profile.profileSalary[0] : null,
profileInsignia: profile.profileInsignias.length > 0 ? profile.profileInsignias[0] : null, profileInsignia: profile.profileInsignias.length > 0 ? profile.profileInsignias[0] : null,
@ -2566,16 +2567,10 @@ export class OrganizationDotnetController extends Controller {
x.orgRevision?.orgRevisionIsCurrent == true, x.orgRevision?.orgRevisionIsCurrent == true,
)?.orgChild4?.ancestorDNA ?? null, )?.orgChild4?.ancestorDNA ?? null,
posNo: shortName ?? "", posNo: shortName ?? "",
markDiscipline: profile.profileDisciplines.length > 0 markDiscipline: profile.profileDisciplines.length > 0 ? true : false,
? true
: false,
markLeave: false, markLeave: false,
markRate: profile.profileAssessments.length > 0 markRate: profile.profileAssessments.length > 0 ? true : false,
? true markInsignia: profile.profileInsignias.length > 0 ? true : false,
: false,
markInsignia: profile.profileInsignias.length > 0
? true
: false,
}; };
}); });
@ -2690,9 +2685,10 @@ export class OrganizationDotnetController extends Controller {
currentZipCode: profile.currentZipCode, currentZipCode: profile.currentZipCode,
// dutyTimeId: profile.dutyTimeId, // dutyTimeId: profile.dutyTimeId,
// dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate, // dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,
posLevel: profile.posType?.posTypeShortName && profile.posLevel?.posLevelName posLevel:
? `${profile.posType.posTypeShortName} ${profile.posLevel.posLevelName}` (profile.posType == null || profile.posType?.posTypeShortName == null
: profile.posType?.posTypeShortName || profile.posLevel?.posLevelName || "", ? ""
: profile.posType?.posTypeShortName + " ") + (profile.posLevel?.posLevelName ?? ""),
posType: profile.posType?.posTypeName ?? "", posType: profile.posType?.posTypeName ?? "",
profileSalary: profile.profileSalary, profileSalary: profile.profileSalary,
profileInsignia: profile.profileInsignias.map((x) => { profileInsignia: profile.profileInsignias.map((x) => {
@ -2846,9 +2842,10 @@ export class OrganizationDotnetController extends Controller {
currentZipCode: profile.currentZipCode, currentZipCode: profile.currentZipCode,
// dutyTimeId: profile.dutyTimeId, // dutyTimeId: profile.dutyTimeId,
// dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate, // dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,
posLevel: profile.posType?.posTypeShortName && profile.posLevel?.posLevelName posLevel:
? `${profile.posType.posTypeShortName} ${profile.posLevel.posLevelName}` (profile.posType == null || profile.posType?.posTypeShortName == null
: profile.posType?.posTypeShortName || profile.posLevel?.posLevelName || "", ? ""
: profile.posType?.posTypeShortName + " ") + (profile.posLevel?.posLevelName ?? ""),
posType: profile.posType?.posTypeName ?? "", posType: profile.posType?.posTypeName ?? "",
profileSalary: profile.profileSalary.map((x) => { profileSalary: profile.profileSalary.map((x) => {
return { ...x, date: x.commandDateAffect ?? new Date() }; return { ...x, date: x.commandDateAffect ?? new Date() };
@ -2951,16 +2948,10 @@ export class OrganizationDotnetController extends Controller {
x.orgRevision?.orgRevisionIsCurrent == true, x.orgRevision?.orgRevisionIsCurrent == true,
)?.orgChild4?.ancestorDNA ?? null, )?.orgChild4?.ancestorDNA ?? null,
posNo: shortName ?? "", posNo: shortName ?? "",
markDiscipline: profile.profileDisciplines.length > 0 markDiscipline: profile.profileDisciplines.length > 0 ? true : false,
? true
: false,
markLeave: false, markLeave: false,
markRate: profile.profileAssessments.length > 0 markRate: profile.profileAssessments.length > 0 ? true : false,
? true markInsignia: profile.profileInsignias.length > 0 ? true : false,
: false,
markInsignia: profile.profileInsignias.length > 0
? true
: false,
}; };
}); });
@ -3946,9 +3937,10 @@ export class OrganizationDotnetController extends Controller {
keycloak: item.keycloak, keycloak: item.keycloak,
posNo: shortName, posNo: shortName,
position: item.position, position: item.position,
positionLevel: item.posLevel positionLevel:
? `${item.posType.posTypeShortName} ${item.posLevel.posLevelName}` (item.posType == null || item.posType?.posTypeShortName == null
: "-", ? ""
: item.posType?.posTypeShortName + " ") + (item.posLevel?.posLevelName ?? ""),
positionType: item.posType?.posTypeName ?? null, positionType: item.posType?.posTypeName ?? null,
oc: Oc, oc: Oc,
}; };
@ -4099,9 +4091,10 @@ export class OrganizationDotnetController extends Controller {
keycloak: item.keycloak, keycloak: item.keycloak,
posNo: shortName, posNo: shortName,
position: item.position, position: item.position,
positionLevel: item.posLevel positionLevel:
? `${item.posType.posTypeShortName} ${item.posLevel.posLevelName}` (item.posType == null || item.posType?.posTypeShortName == null
: "-", ? ""
: item.posType?.posTypeShortName + " ") + (item.posLevel?.posLevelName ?? ""),
positionType: item.posType?.posTypeName ?? null, positionType: item.posType?.posTypeName ?? null,
oc: Oc, oc: Oc,
}; };
@ -4328,9 +4321,9 @@ export class OrganizationDotnetController extends Controller {
telephoneNumber: profile.telephoneNumber ?? "-", telephoneNumber: profile.telephoneNumber ?? "-",
positionName: profile.position ?? "-", positionName: profile.position ?? "-",
posLevel: posLevel:
profile.posType && profile.posLevel (profile.posType == null || profile.posType?.posTypeShortName == null
? `${profile.posType?.posTypeShortName} ${profile.posLevel?.posLevelName}` ? ""
: "-", : profile.posType?.posTypeShortName + " ") + (profile.posLevel?.posLevelName ?? ""),
posType: profile.posType?.posTypeName ?? "-", posType: profile.posType?.posTypeName ?? "-",
currentAddress: currentAddress:
profile && profile.currentAddress profile && profile.currentAddress