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

edit searcg profile

Browse source
This commit is contained in:
kittapath 2024-12-19 14:53:35 +07:00
parent 2977969bad
commit 2a63855b72
3 changed files with 21 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/controllers/ProfileController.ts
View file

@ -6017,7 +6017,6 @@ export class ProfileController extends Controller {
"posType", "posType",
"posLevel", "posLevel",
"current_holders", "current_holders",
"profileSalary",
"current_holders.orgRoot", "current_holders.orgRoot",
"current_holders.orgChild1", "current_holders.orgChild1",
"current_holders.orgChild2", "current_holders.orgChild2",
@ -6062,7 +6061,6 @@ export class ProfileController extends Controller {
"posType", "posType",
"posLevel", "posLevel",
"current_holders", "current_holders",
"profileSalary",
"current_holders.orgRoot", "current_holders.orgRoot",
"current_holders.orgChild1", "current_holders.orgChild1",
"current_holders.orgChild2", "current_holders.orgChild2",
@ -6117,7 +6115,6 @@ export class ProfileController extends Controller {
"posType", "posType",
"posLevel", "posLevel",
"current_holders", "current_holders",
"profileSalary",
"current_holders.orgRoot", "current_holders.orgRoot",
"current_holders.orgChild1", "current_holders.orgChild1",
"current_holders.orgChild2", "current_holders.orgChild2",
@ -6143,7 +6140,6 @@ export class ProfileController extends Controller {
"posType", "posType",
"posLevel", "posLevel",
"current_holders", "current_holders",
"profileSalary",
"current_holders.orgRoot", "current_holders.orgRoot",
"current_holders.orgChild1", "current_holders.orgChild1",
"current_holders.orgChild2", "current_holders.orgChild2",
@ -6169,7 +6165,6 @@ export class ProfileController extends Controller {
"posType", "posType",
"posLevel", "posLevel",
"current_holders", "current_holders",
"profileSalary",
"current_holders.orgRoot", "current_holders.orgRoot",
"current_holders.orgChild1", "current_holders.orgChild1",
"current_holders.orgChild2", "current_holders.orgChild2",
@ -6192,7 +6187,6 @@ export class ProfileController extends Controller {
"posType", "posType",
"posLevel", "posLevel",
"current_holders", "current_holders",
"profileSalary",
"current_holders.orgRoot", "current_holders.orgRoot",
"current_holders.orgChild1", "current_holders.orgChild1",
"current_holders.orgChild2", "current_holders.orgChild2",
@ -6248,17 +6242,6 @@ export class ProfileController extends Controller {
? null ? null
: item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot; : 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( const rootHolder = item.current_holders?.find(
(x) => x.orgRevisionId == findRevision.id, (x) => x.orgRevisionId == findRevision.id,
)?.orgRoot; )?.orgRoot;
@ -6301,7 +6284,7 @@ export class ProfileController extends Controller {
positionTypeName: item.posType?.posTypeName, positionTypeName: item.posType?.posTypeName,
posNo: shortName, posNo: shortName,
organization: root == null ? null : root.orgRootName, organization: root == null ? null : root.orgRootName,
salary: salary == "" ? "" : salary.amount, salary: item.amount,
root: rootHolder?.orgRootName ?? null, root: rootHolder?.orgRootName ?? null,
rootId: rootHolder?.id ?? null, rootId: rootHolder?.id ?? null,
rootShortName: rootHolder?.orgRootShortName ?? null, rootShortName: rootHolder?.orgRootShortName ?? null,
@ -7712,7 +7695,7 @@ export class ProfileController extends Controller {
keycloak: IsNull(), keycloak: IsNull(),
citizenId: Like(`%${body.keyword}%`), citizenId: Like(`%${body.keyword}%`),
}, },
relations: ["posType", "posLevel", "current_holders", "profileSalary"], relations: ["posType", "posLevel", "current_holders"],
skip, skip,
take, take,
}); });
@ -7724,7 +7707,7 @@ export class ProfileController extends Controller {
keycloak: IsNull(), keycloak: IsNull(),
firstName: Like(`%${body.keyword}%`), firstName: Like(`%${body.keyword}%`),
}, },
relations: ["posType", "posLevel", "current_holders", "profileSalary"], relations: ["posType", "posLevel", "current_holders"],
skip, skip,
take, take,
}); });
@ -7736,7 +7719,7 @@ export class ProfileController extends Controller {
keycloak: IsNull(), keycloak: IsNull(),
lastName: Like(`%${body.keyword}%`), lastName: Like(`%${body.keyword}%`),
}, },
relations: ["posType", "posLevel", "current_holders", "profileSalary"], relations: ["posType", "posLevel", "current_holders"],
skip, skip,
take, take,
}); });
@ -7747,7 +7730,7 @@ export class ProfileController extends Controller {
where: { where: {
keycloak: IsNull(), keycloak: IsNull(),
}, },
relations: ["posType", "posLevel", "current_holders", "profileSalary"], relations: ["posType", "posLevel", "current_holders"],
skip, skip,
take, take,
}); });
@ -7797,17 +7780,6 @@ export class ProfileController extends Controller {
? null ? null
: item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot; : 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( const posMasterNo = item.current_holders?.find(
(x) => x.orgRevisionId == findRevision.id, (x) => x.orgRevisionId == findRevision.id,
)?.posMasterNo; )?.posMasterNo;
@ -7835,7 +7807,7 @@ export class ProfileController extends Controller {
positionTypeName: item.posType?.posTypeName, positionTypeName: item.posType?.posTypeName,
posNo: shortName, posNo: shortName,
organization: root == null ? null : root.orgRootShortName, organization: root == null ? null : root.orgRootShortName,
salary: salary == "" ? "" : salary.amount, salary: item.amount,
posMasterNo: posMasterNo ?? null, posMasterNo: posMasterNo ?? null,
posTypeId: item.posTypeId, posTypeId: item.posTypeId,
posTypeName: item.posType?.posTypeName, posTypeName: item.posType?.posTypeName,

36
src/controllers/ProfileEmployeeController.ts
View file

@ -2351,17 +2351,6 @@ export class ProfileEmployeeController extends Controller {
? null ? null
: item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot; : 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( const rootHolder = item.current_holders?.find(
(x) => x.orgRevisionId == findRevision.id, (x) => x.orgRevisionId == findRevision.id,
)?.orgRoot; )?.orgRoot;
@ -2403,8 +2392,8 @@ export class ProfileEmployeeController extends Controller {
positionType: item.posTypeId, positionType: item.posTypeId,
positionTypeName: item.posType?.posTypeName, positionTypeName: item.posType?.posTypeName,
posNo: shortName, posNo: shortName,
organization: root == null ? null : root.orgRootName, organization: root == null ? null : root.orgRootShortName,
salary: salary == "" ? "" : salary.amount, salary: item.amount,
root: rootHolder?.orgRootName ?? null, root: rootHolder?.orgRootName ?? null,
rootId: rootHolder?.id ?? null, rootId: rootHolder?.id ?? null,
rootShortName: rootHolder?.orgRootShortName ?? null, rootShortName: rootHolder?.orgRootShortName ?? null,
@ -3927,7 +3916,7 @@ export class ProfileEmployeeController extends Controller {
citizenId: Like(`%${body.keyword}%`), citizenId: Like(`%${body.keyword}%`),
employeeClass: "PREM", employeeClass: "PREM",
}, },
relations: ["posType", "posLevel", "current_holders", "profileSalary"], relations: ["posType", "posLevel", "current_holders"],
skip, skip,
take, take,
}); });
@ -3940,7 +3929,7 @@ export class ProfileEmployeeController extends Controller {
firstName: Like(`%${body.keyword}%`), firstName: Like(`%${body.keyword}%`),
employeeClass: "PREM", employeeClass: "PREM",
}, },
relations: ["posType", "posLevel", "current_holders", "profileSalary"], relations: ["posType", "posLevel", "current_holders"],
skip, skip,
take, take,
}); });
@ -3953,7 +3942,7 @@ export class ProfileEmployeeController extends Controller {
lastName: Like(`%${body.keyword}%`), lastName: Like(`%${body.keyword}%`),
employeeClass: "PREM", employeeClass: "PREM",
}, },
relations: ["posType", "posLevel", "current_holders", "profileSalary"], relations: ["posType", "posLevel", "current_holders"],
skip, skip,
take, take,
}); });
@ -3965,7 +3954,7 @@ export class ProfileEmployeeController extends Controller {
keycloak: IsNull(), keycloak: IsNull(),
employeeClass: "PREM", employeeClass: "PREM",
}, },
relations: ["posType", "posLevel", "current_holders", "profileSalary"], relations: ["posType", "posLevel", "current_holders"],
skip, skip,
take, take,
}); });
@ -4015,17 +4004,6 @@ export class ProfileEmployeeController extends Controller {
? null ? null
: item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot; : 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( const posMasterNo = item.current_holders?.find(
(x) => x.orgRevisionId == findRevision.id, (x) => x.orgRevisionId == findRevision.id,
)?.posMasterNo; )?.posMasterNo;
@ -4053,7 +4031,7 @@ export class ProfileEmployeeController extends Controller {
positionTypeName: item.posType?.posTypeName, positionTypeName: item.posType?.posTypeName,
posNo: shortName, posNo: shortName,
organization: root == null ? null : root.orgRootShortName, organization: root == null ? null : root.orgRootShortName,
salary: salary == "" ? "" : salary.amount, salary: item.amount,
posMasterNo: posMasterNo ?? null, posMasterNo: posMasterNo ?? null,
posTypeId: item.posTypeId, posTypeId: item.posTypeId,
posTypeName: item.posType?.posTypeName, posTypeName: item.posType?.posTypeName,

42
src/controllers/ProfileEmployeeTempController.ts
View file

@ -1898,7 +1898,6 @@ export class ProfileEmployeeTempController extends Controller {
"posType", "posType",
"posLevel", "posLevel",
"current_holders", "current_holders",
"profileSalary",
"current_holders.orgRoot", "current_holders.orgRoot",
"current_holders.orgChild1", "current_holders.orgChild1",
"current_holders.orgChild2", "current_holders.orgChild2",
@ -1917,7 +1916,6 @@ export class ProfileEmployeeTempController extends Controller {
"posType", "posType",
"posLevel", "posLevel",
"current_holders", "current_holders",
"profileSalary",
"current_holders.orgRoot", "current_holders.orgRoot",
"current_holders.orgChild1", "current_holders.orgChild1",
"current_holders.orgChild2", "current_holders.orgChild2",
@ -1936,7 +1934,6 @@ export class ProfileEmployeeTempController extends Controller {
"posType", "posType",
"posLevel", "posLevel",
"current_holders", "current_holders",
"profileSalary",
"current_holders.orgRoot", "current_holders.orgRoot",
"current_holders.orgChild1", "current_holders.orgChild1",
"current_holders.orgChild2", "current_holders.orgChild2",
@ -1954,7 +1951,6 @@ export class ProfileEmployeeTempController extends Controller {
"posType", "posType",
"posLevel", "posLevel",
"current_holders", "current_holders",
"profileSalary",
"current_holders.orgRoot", "current_holders.orgRoot",
"current_holders.orgChild1", "current_holders.orgChild1",
"current_holders.orgChild2", "current_holders.orgChild2",
@ -2010,17 +2006,6 @@ export class ProfileEmployeeTempController extends Controller {
? null ? null
: item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot; : 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( const rootHolder = item.current_holders?.find(
(x) => x.orgRevisionId == findRevision.id, (x) => x.orgRevisionId == findRevision.id,
)?.orgRoot; )?.orgRoot;
@ -2062,8 +2047,8 @@ export class ProfileEmployeeTempController extends Controller {
positionType: item.posTypeId, positionType: item.posTypeId,
positionTypeName: item.posType?.posTypeName, positionTypeName: item.posType?.posTypeName,
posNo: shortName, posNo: shortName,
organization: root == null ? null : root.orgRootShortName, organization: root == null ? null : root.orgRootName,
salary: salary == "" ? "" : salary.amount, salary: item.amount,
root: rootHolder?.orgRootName ?? null, root: rootHolder?.orgRootName ?? null,
rootId: rootHolder?.id ?? null, rootId: rootHolder?.id ?? null,
rootShortName: rootHolder?.orgRootShortName ?? null, rootShortName: rootHolder?.orgRootShortName ?? null,
@ -3478,7 +3463,7 @@ export class ProfileEmployeeTempController extends Controller {
keycloak: IsNull(), keycloak: IsNull(),
citizenId: Like(`%${body.keyword}%`), citizenId: Like(`%${body.keyword}%`),
}, },
relations: ["posType", "posLevel", "current_holders", "profileSalary"], relations: ["posType", "posLevel", "current_holders"],
skip, skip,
take, take,
}); });
@ -3490,7 +3475,7 @@ export class ProfileEmployeeTempController extends Controller {
keycloak: IsNull(), keycloak: IsNull(),
firstName: Like(`%${body.keyword}%`), firstName: Like(`%${body.keyword}%`),
}, },
relations: ["posType", "posLevel", "current_holders", "profileSalary"], relations: ["posType", "posLevel", "current_holders"],
skip, skip,
take, take,
}); });
@ -3502,7 +3487,7 @@ export class ProfileEmployeeTempController extends Controller {
keycloak: IsNull(), keycloak: IsNull(),
lastName: Like(`%${body.keyword}%`), lastName: Like(`%${body.keyword}%`),
}, },
relations: ["posType", "posLevel", "current_holders", "profileSalary"], relations: ["posType", "posLevel", "current_holders"],
skip, skip,
take, take,
}); });
@ -3513,7 +3498,7 @@ export class ProfileEmployeeTempController extends Controller {
where: { where: {
keycloak: IsNull(), keycloak: IsNull(),
}, },
relations: ["posType", "posLevel", "current_holders", "profileSalary"], relations: ["posType", "posLevel", "current_holders"],
skip, skip,
take, take,
}); });
@ -3563,17 +3548,6 @@ export class ProfileEmployeeTempController extends Controller {
? null ? null
: item.current_holders.find((x) => x.orgRevisionId == findRevision.id)?.orgRoot; : 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( const posMasterNo = item.current_holders?.find(
(x) => x.orgRevisionId == findRevision.id, (x) => x.orgRevisionId == findRevision.id,
)?.posMasterNo; )?.posMasterNo;
@ -3600,8 +3574,8 @@ export class ProfileEmployeeTempController extends Controller {
positionType: item.posTypeId, positionType: item.posTypeId,
positionTypeName: item.posType?.posTypeName, positionTypeName: item.posType?.posTypeName,
posNo: shortName, posNo: shortName,
organization: root == null ? null : root.orgRootShortName, organization: root == null ? null : root.orgRootName,
salary: salary == "" ? "" : salary.amount, salary: item.amount,
posMasterNo: posMasterNo ?? null, posMasterNo: posMasterNo ?? null,
posTypeId: item.posTypeId, posTypeId: item.posTypeId,
posTypeName: item.posType?.posTypeName, posTypeName: item.posType?.posTypeName,