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

แยกชื่อสังกัด emp

Browse source
This commit is contained in:
AdisakKanthawilang 2024-07-12 10:22:36 +07:00
parent dda2b64bc2
commit 318088a940
1 changed files with 45 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

75
src/controllers/ReportController.ts
View file

@ -4764,16 +4764,18 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
return { return {
no: Extension.ToThaiNumber((index + 1).toLocaleString()), no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullName: fullName, fullName: fullName,
affiliation: affiliation,
position: profile.position, position: profile.position,
posLevel: profile.posLevel, posLevel: profile.posLevel,
posNumber: posNumber:
@ -4845,16 +4847,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
return { return {
no: Extension.ToThaiNumber((index + 1).toLocaleString()), no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullName: fullName, fullName: fullName,
affiliation: affiliation,
posLevel: profile.posLevel, posLevel: profile.posLevel,
posNumber: posNumber:
Extension.ToThaiNumber(profile.orgShortName) + Extension.ToThaiNumber(profile.orgShortName) +
@ -4969,16 +4972,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
return { return {
no: Extension.ToThaiNumber((index + 1).toLocaleString()), no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullName: fullName, fullName: fullName,
affiliation: affiliation,
position: profile.position, position: profile.position,
posLevel: profile.posLevel, posLevel: profile.posLevel,
posNumber: posNumber:
@ -5122,16 +5126,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
return { return {
no: Extension.ToThaiNumber((index + 1).toLocaleString()), no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullName: fullName, fullName: fullName,
affiliation: affiliation,
position: position:
profile.position + profile.position +
"/" + "/" +
@ -5210,22 +5215,23 @@ export class ReportController extends Controller {
const agency = _salaryPeriod[0] == null ? "" : _salaryPeriod[0].root; const agency = _salaryPeriod[0] == null ? "" : _salaryPeriod[0].root;
const formattedData = _salaryPeriod.map((profile, index) => { const formattedData = _salaryPeriod.map((profile, index) => {
const fullNameParts = [ const fullNameParts = [
profile.child4, profile.child4,
profile.child3, profile.child3,
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
return { return {
no: Extension.ToThaiNumber((index + 1).toLocaleString()), no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullName: fullName, fullName: fullName,
affiliation: affiliation,
position: profile.position, position: profile.position,
posLevel: profile.posLevel posLevel: profile.posLevel
? Extension.ToThaiNumber(profile.posLevel.toLocaleString()) ? Extension.ToThaiNumber(profile.posLevel.toLocaleString())
@ -5320,22 +5326,23 @@ export class ReportController extends Controller {
const agency = salaryProfile[0] == null ? "" : salaryProfile[0].root; const agency = salaryProfile[0] == null ? "" : salaryProfile[0].root;
const formattedData = salaryProfile.map((profile, index) => { const formattedData = salaryProfile.map((profile, index) => {
const fullNameParts = [ const fullNameParts = [
profile.child4, profile.child4,
profile.child3, profile.child3,
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
return { return {
no: Extension.ToThaiNumber((index + 1).toLocaleString()), no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullName: fullName, fullName: fullName,
affiliation: affiliation,
position: profile.position, position: profile.position,
posLevel: profile.posLevel, posLevel: profile.posLevel,
posNumber: posNumber:
@ -5402,22 +5409,23 @@ export class ReportController extends Controller {
const agency = _salaryProfileEmp[0] == null ? "" : _salaryProfileEmp[0].root; const agency = _salaryProfileEmp[0] == null ? "" : _salaryProfileEmp[0].root;
const formattedData = _salaryProfileEmp.map((profile, index) => { const formattedData = _salaryProfileEmp.map((profile, index) => {
const fullNameParts = [ const fullNameParts = [
profile.child4, profile.child4,
profile.child3, profile.child3,
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
return { return {
no: Extension.ToThaiNumber((index + 1).toLocaleString()), no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullName: fullName, fullName: fullName,
affiliation: affiliation,
position: position:
profile.position + profile.position +
"/" + "/" +
@ -5495,16 +5503,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
return { return {
no: Extension.ToThaiNumber((index + 1).toLocaleString()), no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullName: fullName, fullName: fullName,
affiliation: affiliation,
position: profile.position, position: profile.position,
posLevel: profile.posLevel posLevel: profile.posLevel
? Extension.ToThaiNumber(profile.posLevel.toLocaleString()) ? Extension.ToThaiNumber(profile.posLevel.toLocaleString())
@ -5608,16 +5617,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
return { return {
no: Extension.ToThaiNumber((index + 1).toLocaleString()), no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullName: fullName, fullName: fullName,
affiliation: affiliation,
position: profile.position, position: profile.position,
posLevel: profile.posLevel posLevel: profile.posLevel
? Extension.ToThaiNumber(profile.posLevel.toLocaleString()) ? Extension.ToThaiNumber(profile.posLevel.toLocaleString())
@ -5692,16 +5702,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
return { return {
no: Extension.ToThaiNumber((index + 1).toLocaleString()), no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullName: fullName, fullName: fullName,
affiliation: affiliation,
position: position:
profile.position + profile.position +
"/" + "/" +
@ -5781,16 +5792,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
return { return {
no: Extension.ToThaiNumber((index + 1).toLocaleString()), no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullName: fullName, fullName: fullName,
affiliation: affiliation,
position: position:
profile.position + profile.position +
"/" + "/" +
@ -5881,16 +5893,18 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
return { return {
no: Extension.ToThaiNumber((index + 1).toLocaleString()), no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullName: fullName, fullName: fullName,
affiliation: affiliation,
position: profile.position, position: profile.position,
posLevel: profile.posLevel posLevel: profile.posLevel
? Extension.ToThaiNumber(profile.posLevel.toLocaleString()) ? Extension.ToThaiNumber(profile.posLevel.toLocaleString())
@ -6214,16 +6228,17 @@ export class ReportController extends Controller {
profile.child2, profile.child2,
profile.child1, profile.child1,
profile.root, profile.root,
`${profile.prefix}${profile.firstName} ${profile.lastName}`,
]; ];
const fullName = fullNameParts const affiliation = fullNameParts
.filter((part) => part !== undefined && part !== null) .filter((part) => part !== undefined && part !== null)
.join("/"); .join("/");
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
return { return {
no: Extension.ToThaiNumber((index + 1).toLocaleString()), no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullName: fullName, fullName: fullName,
affiliation: affiliation,
position: profile.position, position: profile.position,
posLevel: profile.posLevel posLevel: profile.posLevel
? Extension.ToThaiNumber(profile.posLevel.toLocaleString()) ? Extension.ToThaiNumber(profile.posLevel.toLocaleString())