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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2024-12-19 20:03:20 +07:00
commit ba00ce14d2
5 changed files with 199 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/controllers/ProfileEmployeeTempController.ts
View file

@ -1899,7 +1899,6 @@ export class ProfileEmployeeTempController extends Controller {
"posType",
"posLevel",
"current_holders",
"profileSalary",
"current_holders.orgRoot",
"current_holders.orgChild1",
"current_holders.orgChild2",
@ -1918,7 +1917,6 @@ export class ProfileEmployeeTempController extends Controller {
"posType",
"posLevel",
"current_holders",
"profileSalary",
"current_holders.orgRoot",
"current_holders.orgChild1",
"current_holders.orgChild2",
@ -1937,7 +1935,6 @@ export class ProfileEmployeeTempController extends Controller {
"posType",
"posLevel",
"current_holders",
"profileSalary",
"current_holders.orgRoot",
"current_holders.orgChild1",
"current_holders.orgChild2",
@ -1955,7 +1952,6 @@ export class ProfileEmployeeTempController extends Controller {
"posType",
"posLevel",
"current_holders",
"profileSalary",
"current_holders.orgRoot",
"current_holders.orgChild1",
"current_holders.orgChild2",
@ -2011,17 +2007,6 @@ export class ProfileEmployeeTempController extends Controller {
? null
: item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot;
let salary: any = "";
if (item != null && item.profileSalary != null && item.profileSalary.length > 0) {
let _salary: any = item.profileSalary.sort(
(a, b) =>
(b.date == null ? 0 : b.date.getTime()) - (a.date == null ? 0 : a.date.getTime()),
);
if (_salary.length > 0) {
salary = _salary[0];
}
}
const rootHolder = item.current_holders?.find(
(x) => x.orgRevisionId == findRevision.id,
)?.orgRoot;
@ -2063,8 +2048,8 @@ export class ProfileEmployeeTempController extends Controller {
positionType: item.posTypeId,
positionTypeName: item.posType?.posTypeName,
posNo: shortName,
organization: root == null ? null : root.orgRootShortName,
salary: salary == "" ? "" : salary.amount,
organization: root == null ? null : root.orgRootName,
salary: item.amount,
root: rootHolder?.orgRootName ?? null,
rootId: rootHolder?.id ?? null,
rootShortName: rootHolder?.orgRootShortName ?? null,
@ -3479,7 +3464,7 @@ export class ProfileEmployeeTempController extends Controller {
keycloak: IsNull(),
citizenId: Like(`%${body.keyword}%`),
},
relations: ["posType", "posLevel", "current_holders", "profileSalary"],
relations: ["posType", "posLevel", "current_holders"],
skip,
take,
});
@ -3491,7 +3476,7 @@ export class ProfileEmployeeTempController extends Controller {
keycloak: IsNull(),
firstName: Like(`%${body.keyword}%`),
},
relations: ["posType", "posLevel", "current_holders", "profileSalary"],
relations: ["posType", "posLevel", "current_holders"],
skip,
take,
});
@ -3503,7 +3488,7 @@ export class ProfileEmployeeTempController extends Controller {
keycloak: IsNull(),
lastName: Like(`%${body.keyword}%`),
},
relations: ["posType", "posLevel", "current_holders", "profileSalary"],
relations: ["posType", "posLevel", "current_holders"],
skip,
take,
});
@ -3514,7 +3499,7 @@ export class ProfileEmployeeTempController extends Controller {
where: {
keycloak: IsNull(),
},
relations: ["posType", "posLevel", "current_holders", "profileSalary"],
relations: ["posType", "posLevel", "current_holders"],
skip,
take,
});
@ -3564,17 +3549,6 @@ export class ProfileEmployeeTempController extends Controller {
? null
: item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot;
let salary: any = "";
if (item != null && item.profileSalary != null && item.profileSalary.length > 0) {
let _salary: any = item.profileSalary.sort(
(a, b) =>
(b.date == null ? 0 : b.date.getTime()) - (a.date == null ? 0 : a.date.getTime()),
);
if (_salary.length > 0) {
salary = _salary[0];
}
}
const posMasterNo = item.current_holders?.find(
(x) => x.orgRevisionId == findRevision.id,
)?.posMasterNo;
@ -3601,8 +3575,8 @@ export class ProfileEmployeeTempController extends Controller {
positionType: item.posTypeId,
positionTypeName: item.posType?.posTypeName,
posNo: shortName,
organization: root == null ? null : root.orgRootShortName,
salary: salary == "" ? "" : salary.amount,
organization: root == null ? null : root.orgRootName,
salary: item.amount,
posMasterNo: posMasterNo ?? null,
posTypeId: item.posTypeId,
posTypeName: item.posType?.posTypeName,