From ef7a8bc0e827482d5acb6ae3d603a9601edc9799 Mon Sep 17 00:00:00 2001 From: Bright Date: Thu, 28 Aug 2025 17:07:45 +0700 Subject: [PATCH] update #1406 --- src/controllers/ProfileSalaryController.ts | 6 ++++++ src/entities/view/viewRegistryEmployee.ts | 3 +++ 2 files changed, 9 insertions(+) diff --git a/src/controllers/ProfileSalaryController.ts b/src/controllers/ProfileSalaryController.ts index 1f3c614b..7f9615af 100644 --- a/src/controllers/ProfileSalaryController.ts +++ b/src/controllers/ProfileSalaryController.ts @@ -348,6 +348,9 @@ export class ProfileSalaryController extends Controller { .filter(x => profileIds.has(x.profileId)) .map(x => ({ ...x, + isProbation: Boolean(x.isProbation), + isLeave: Boolean(x.isLeave), + isRetirement: Boolean(x.isRetirement), Educations: x.Educations ? JSON.stringify(x.Educations) : "", })); if (mapData.length > 0) { @@ -367,6 +370,9 @@ export class ProfileSalaryController extends Controller { .filter(x => profileEmpIds.has(x.profileEmployeeId)) .map(x => ({ ...x, + isProbation: Boolean(x.isProbation), + isLeave: Boolean(x.isLeave), + isRetirement: Boolean(x.isRetirement), Educations: x.Educations ? JSON.stringify(x.Educations) : "", })); if (mapData.length > 0) { diff --git a/src/entities/view/viewRegistryEmployee.ts b/src/entities/view/viewRegistryEmployee.ts index a26e20f0..807d08bc 100644 --- a/src/entities/view/viewRegistryEmployee.ts +++ b/src/entities/view/viewRegistryEmployee.ts @@ -298,4 +298,7 @@ export class viewRegistryEmployee { @ViewColumn() fields: string; + + @ViewColumn() + employeeClass: string; }