From e09317203e395e04f3d4a46a79e88878ca01d566 Mon Sep 17 00:00:00 2001 From: Bright Date: Fri, 14 Mar 2025 16:05:39 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=A2=E0=B8=B0=E0=B9=80?= =?UTF-8?q?=E0=B8=A7=E0=B8=A5=E0=B8=B2=E0=B8=94=E0=B8=B3=E0=B8=A3=E0=B8=87?= =?UTF-8?q?=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87?= =?UTF-8?q?=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87?= =?UTF-8?q?=20#1245?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProfileSalaryEmployeeController.ts | 138 ++++++++++++++---- 1 file changed, 112 insertions(+), 26 deletions(-) diff --git a/src/controllers/ProfileSalaryEmployeeController.ts b/src/controllers/ProfileSalaryEmployeeController.ts index 59e97ef1..d5b301c7 100644 --- a/src/controllers/ProfileSalaryEmployeeController.ts +++ b/src/controllers/ProfileSalaryEmployeeController.ts @@ -100,24 +100,67 @@ export class ProfileSalaryEmployeeController extends Controller { const mapPosition = _position.length > 1 ? _position.slice(1).map((curr: any, index: number) => ({ - year: curr.Years ? Math.floor(Number(curr.Years)) : 0, - month: curr.Months ? Math.floor(Number(curr.Months)) : 0, - day: curr.Days ? Math.floor(Number(curr.Days)) : 0, + days: curr.days_diff ? Number(curr.days_diff) : 0, name: _position[index]?.positionName, })) : []; - const posLevel: any = [ - // { - // year: 3, - // month: 0, - // day: 0, - // name: "ส 1", - // } - ]; + const groupMapPosition = mapPosition.reduce( + (acc: any, curr: any) => { + let existing = acc.find((item: any) => item.name === curr.name); + + if (existing) { + existing.days += curr.days; + } else { + existing = { name: curr.name, days: curr.days }; + acc.push(existing); + } + + existing.year = Math.floor(existing.days / 365.2524); + existing.month = Math.floor((existing.days / 30.4375) % 12); + existing.day = Math.floor(existing.days % 30.4375); + + return acc; + }, + [] as { name: string; days: number; year: number; month: number; day: number }[], + ); + + const posLevel = await AppDataSource.query("CALL GetProfileEmployeeSalaryLevel(?)", [profile.id]); + const _posLevel = posLevel.length > 0 ? posLevel[0] : []; + const mapPosLevel = + _posLevel.length > 1 + ? _posLevel.slice(1).map((curr: any, index: number) => ({ + days: curr.days_diff ? Number(curr.days_diff) : 0, + name: + !_posLevel[index]?.positionType && _posLevel[index]?.positionCee + ? `ระดับ ${_posLevel[index]?.positionCee.trim()}` + : _posLevel[index]?.positionLevel, + })) + : []; + + const groupMapPosLevel = mapPosLevel.reduce( + (acc: any, curr: any) => { + let existing = acc.find((item: any) => item.name === curr.name); + + if (existing) { + existing.days += curr.days; + } else { + existing = { name: curr.name, days: curr.days }; + acc.push(existing); + } + + existing.year = Math.floor(existing.days / 365.2524); + existing.month = Math.floor((existing.days / 30.4375) % 12); + existing.day = Math.floor(existing.days % 30.4375); + + return acc; + }, + [] as { name: string; days: number; year: number; month: number; day: number }[], + ); + return new HttpSuccess({ - position: mapPosition, - posLevel: posLevel, + position: groupMapPosition, + posLevel: groupMapPosLevel, }); } @@ -130,24 +173,67 @@ export class ProfileSalaryEmployeeController extends Controller { const mapPosition = _position.length > 1 ? _position.slice(1).map((curr: any, index: number) => ({ - year: curr.Years ? Math.floor(Number(curr.Years)) : 0, - month: curr.Months ? Math.floor(Number(curr.Months)) : 0, - day: curr.Days ? Math.floor(Number(curr.Days)) : 0, + days: curr.days_diff ? Number(curr.days_diff) : 0, name: _position[index]?.positionName, })) : []; - const posLevel: any = [ - // { - // year: 3, - // month: 0, - // day: 0, - // name: "ส 1", - // } - ]; + const groupMapPosition = mapPosition.reduce( + (acc: any, curr: any) => { + let existing = acc.find((item: any) => item.name === curr.name); + + if (existing) { + existing.days += curr.days; + } else { + existing = { name: curr.name, days: curr.days }; + acc.push(existing); + } + + existing.year = Math.floor(existing.days / 365.2524); + existing.month = Math.floor((existing.days / 30.4375) % 12); + existing.day = Math.floor(existing.days % 30.4375); + + return acc; + }, + [] as { name: string; days: number; year: number; month: number; day: number }[], + ); + + const posLevel = await AppDataSource.query("CALL GetProfileEmployeeSalaryLevel(?)", [profileId]); + const _posLevel = posLevel.length > 0 ? posLevel[0] : []; + const mapPosLevel = + _posLevel.length > 1 + ? _posLevel.slice(1).map((curr: any, index: number) => ({ + days: curr.days_diff ? Number(curr.days_diff) : 0, + name: + !_posLevel[index]?.positionType && _posLevel[index]?.positionCee + ? `ระดับ ${_posLevel[index]?.positionCee.trim()}` + : _posLevel[index]?.positionLevel, + })) + : []; + + const groupMapPosLevel = mapPosLevel.reduce( + (acc: any, curr: any) => { + let existing = acc.find((item: any) => item.name === curr.name); + + if (existing) { + existing.days += curr.days; + } else { + existing = { name: curr.name, days: curr.days }; + acc.push(existing); + } + + existing.year = Math.floor(existing.days / 365.2524); + existing.month = Math.floor((existing.days / 30.4375) % 12); + existing.day = Math.floor(existing.days % 30.4375); + + return acc; + }, + [] as { name: string; days: number; year: number; month: number; day: number }[], + ); + return new HttpSuccess({ - position: mapPosition, - posLevel: posLevel, + position: groupMapPosition, + posLevel: groupMapPosLevel, }); }