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

no message

Browse source
This commit is contained in:
Kittapath 2024-07-08 11:06:40 +07:00
parent 16ca14fc51
commit 014301dcc4
33 changed files with 54 additions and 768 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/controllers/EmployeePositionController.ts
View file

@ -1348,7 +1348,16 @@ export class EmployeePositionController extends Controller {
: posMaster.ancestorDNA,
},
order: { lastUpdatedAt: "DESC" },
relations: ["orgRoot", "orgChild1", "orgChild2", "orgChild3", "orgChild4"],
relations: [
"orgRoot",
"orgChild1",
"orgChild2",
"orgChild3",
"orgChild4",
"positions",
"positions.posLevel",
"positions.posType",
],
});
const _data = posMasters.map((item) => ({
id: item.id,
@ -1369,6 +1378,9 @@ export class EmployeePositionController extends Controller {
posMasterNo: item.posMasterNo ? item.posMasterNo : null,
posMasterNoSuffix: item.posMasterNoSuffix ? item.posMasterNoSuffix : null,
reason: item.reason ? item.reason : null,
position: item.positions.map((x) => x.positionName).join("/"),
posLevel: item.positions.map((x) => x.posLevel.posLevelName).join("/"),
posType: item.positions.map((x) => x.posType.posTypeName).join("/"),
}));
return new HttpSuccess(_data);
}

8
src/controllers/OrganizationController.ts
View file

@ -844,7 +844,7 @@ export class OrganizationController extends Controller {
orgTreeFax: orgChild1.orgChild1Fax,
orgRevisionId: orgRoot.orgRevisionId,
orgRootName: orgRoot.orgRootName,
responsibility: orgRoot.responsibility,
responsibility: orgChild1.responsibility,
labelName:
orgChild1.orgChild1Name +
" " +
@ -959,7 +959,7 @@ export class OrganizationController extends Controller {
orgTreeFax: orgChild2.orgChild2Fax,
orgRevisionId: orgRoot.orgRevisionId,
orgRootName: orgRoot.orgRootName,
responsibility: orgRoot.responsibility,
responsibility: orgChild2.responsibility,
labelName:
orgChild2.orgChild2Name +
" " +
@ -1077,7 +1077,7 @@ export class OrganizationController extends Controller {
orgTreeFax: orgChild3.orgChild3Fax,
orgRevisionId: orgRoot.orgRevisionId,
orgRootName: orgRoot.orgRootName,
responsibility: orgRoot.responsibility,
responsibility: orgChild3.responsibility,
labelName:
orgChild3.orgChild3Name +
" " +
@ -1195,7 +1195,7 @@ export class OrganizationController extends Controller {
orgTreeFax: orgChild4.orgChild4Fax,
orgRevisionId: orgRoot.orgRevisionId,
orgRootName: orgRoot.orgRootName,
responsibility: orgRoot.responsibility,
responsibility: orgChild4.responsibility,
labelName:
orgChild4.orgChild4Name +
" " +

17
src/controllers/OrganizationUnauthorizeController.ts
View file

@ -194,7 +194,9 @@ export class OrganizationUnauthorizeController extends Controller {
const latestProfileAssessment = item.current_holder.profileAssessments
? item.current_holder.profileAssessments.sort((a: any, b: any) => b.date - a.date)[0]
: null;
const pointSum = latestProfileAssessment ? latestProfileAssessment.pointSum : null;
const pointSum = latestProfileAssessment
? `(${this.textPointSummaryKpi(latestProfileAssessment.pointSum)})${latestProfileAssessment.pointSum}`
: null;
return {
id: item.id,
profileId: item.current_holder.id,
@ -404,7 +406,9 @@ export class OrganizationUnauthorizeController extends Controller {
const latestProfileAssessment = item.current_holder.profileAssessments
? item.current_holder.profileAssessments.sort((a: any, b: any) => b.date - a.date)[0]
: null;
const pointSum = latestProfileAssessment ? latestProfileAssessment.pointSum : null;
const pointSum = latestProfileAssessment
? `(${this.textPointSummaryKpi(latestProfileAssessment.pointSum)})${latestProfileAssessment.pointSum}`
: null;
return {
profileId: item.current_holder.id,
salaryLevel: item.current_holder.salaryLevel,
@ -841,4 +845,13 @@ export class OrganizationUnauthorizeController extends Controller {
posTypeId: findProfile.posTypeId,
});
}
textPointSummaryKpi(val: number | undefined) {
if (val == undefined || val == null) val = -1;
if (val >= 0 && val <= 60) return "ต้องปรับปรุง";
if (val >= 60 && val <= 69) return "พอใช้";
if (val >= 70 && val <= 79) return "ดี";
if (val >= 80 && val <= 89) return "ดีมาก";
if (val >= 90 && val <= 100) return "ดีเด่น";
else return "-";
}
}

23
src/controllers/PositionController.ts
View file

@ -1568,7 +1568,18 @@ export class PositionController extends Controller {
: posMaster.ancestorDNA,
},
order: { lastUpdatedAt: "DESC" },
relations: ["orgRoot", "orgChild1", "orgChild2", "orgChild3", "orgChild4"],
relations: [
"orgRoot",
"orgChild1",
"orgChild2",
"orgChild3",
"orgChild4",
"current_holder",
"positions",
"positions.posLevel",
"positions.posType",
"positions.posExecutive",
],
});
const _data = posMasters.map((item) => ({
id: item.id,
@ -1589,6 +1600,16 @@ export class PositionController extends Controller {
posMasterNo: item.posMasterNo ? item.posMasterNo : null,
posMasterNoSuffix: item.posMasterNoSuffix ? item.posMasterNoSuffix : null,
reason: item.reason ? item.reason : null,
position: item.positions.map((x) => x.positionName).join("/"),
posExecutive: item.positions.map((x) => x.posExecutive.posExecutiveName).join("/"),
posLevel: item.positions.map((x) => x.posLevel.posLevelName).join("/"),
posType: item.positions.map((x) => x.posType.posTypeName).join("/"),
fullname:
item.current_holder.prefix +
" " +
item.current_holder.firstName +
" " +
item.current_holder.lastName,
}));
return new HttpSuccess(_data);
}