From 4be0b068bcc0030b7e2e12a4448b05af8ffaa853 Mon Sep 17 00:00:00 2001 From: Adisak Date: Thu, 2 Oct 2025 14:37:25 +0700 Subject: [PATCH] #170 and calAge --- src/controllers/OrganizationDotnetController.ts | 4 ++-- src/controllers/ProfileEmployeeController.ts | 6 +++--- src/controllers/ProfileEmployeeTempController.ts | 4 ++-- src/controllers/ProfileSalaryTempController.ts | 2 +- src/interfaces/extension.ts | 6 ++++-- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/controllers/OrganizationDotnetController.ts b/src/controllers/OrganizationDotnetController.ts index 415759af..38e17b06 100644 --- a/src/controllers/OrganizationDotnetController.ts +++ b/src/controllers/OrganizationDotnetController.ts @@ -5521,7 +5521,7 @@ export class OrganizationDotnetController extends Controller { govAge: profile.dateAppoint ? `${Extension.CalculateGovAge(profile.dateAppoint, 0, 0)} ปี` : "-", - age: profile.birthDate ? Extension.CalculateAgeStrV2(profile.birthDate, 0, 0) : "-", + age: profile.birthDate ? Extension.CalculateAgeStrV2(profile.birthDate, 0, 0, "GET") : "-", dateAppoint: profile.dateAppoint, dateCurrent: new Date(), amount: profile.amount ?? "-", @@ -5636,7 +5636,7 @@ export class OrganizationDotnetController extends Controller { govAge: profile.dateAppoint ? `${Extension.CalculateGovAge(profile.dateAppoint, 0, 0)} ปี` : "-", - age: profile.birthDate ? Extension.CalculateAgeStrV2(profile.birthDate, 0, 0) : "-", + age: profile.birthDate ? Extension.CalculateAgeStrV2(profile.birthDate, 0, 0, "GET") : "-", dateAppoint: profile.dateAppoint, dateCurrent: new Date(), amount: profile.amount ?? "-", diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index 076881de..c1f1db7a 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -2127,7 +2127,7 @@ export class ProfileEmployeeController extends Controller { posNo: _data.employeeClass == "TEMP" ? _data.posMasterNoTemp : shortName, employeeClass: _data.employeeClass == null ? null : _data.employeeClass, govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0), - age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0), + age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0, "GET"), dateEmployment: dateEmployment, dateAppoint: _data.dateAppoint, dateStart: _data.dateStart, @@ -2995,7 +2995,7 @@ export class ProfileEmployeeController extends Controller { : _data.profileSalary[0].posNo || "", employeeClass: _data.employeeClass == null ? null : _data.employeeClass, govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0), - age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0), + age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0, "GET"), dateEmployment: dateEmployment, dateAppoint: _data.dateAppoint, dateStart: _data.dateStart, @@ -3417,7 +3417,7 @@ export class ProfileEmployeeController extends Controller { posNo: _data.employeeClass == "TEMP" ? _data.posMasterNoTemp : shortName, employeeClass: _data.employeeClass == null ? null : _data.employeeClass, govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0), - age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0), + age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0, "GET"), dateEmployment: dateEmployment, dateAppoint: _data.dateAppoint, dateStart: _data.dateStart, diff --git a/src/controllers/ProfileEmployeeTempController.ts b/src/controllers/ProfileEmployeeTempController.ts index e5d03e4a..12c65e10 100644 --- a/src/controllers/ProfileEmployeeTempController.ts +++ b/src/controllers/ProfileEmployeeTempController.ts @@ -1189,7 +1189,7 @@ export class ProfileEmployeeTempController extends Controller { posNo: _data.employeeClass == "TEMP" ? _data.posMasterNoTemp : shortName, employeeClass: _data.employeeClass == null ? null : _data.employeeClass, govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0), - age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0), + age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0, "GET"), dateEmployment: dateEmployment, dateAppoint: _data.dateAppoint, dateStart: _data.dateStart, @@ -1724,7 +1724,7 @@ export class ProfileEmployeeTempController extends Controller { posNo: _data.employeeClass == "TEMP" ? _data.posMasterNoTemp : shortName, employeeClass: _data.employeeClass == null ? null : _data.employeeClass, govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0), - age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0), + age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0, "GET"), dateEmployment: dateEmployment, dateAppoint: _data.dateAppoint, dateStart: _data.dateStart, diff --git a/src/controllers/ProfileSalaryTempController.ts b/src/controllers/ProfileSalaryTempController.ts index b160f98d..5da8860e 100644 --- a/src/controllers/ProfileSalaryTempController.ts +++ b/src/controllers/ProfileSalaryTempController.ts @@ -878,7 +878,7 @@ export class ProfileSalaryTempController extends Controller { posNo: _data.employeeClass == "TEMP" ? _data.posMasterNoTemp : shortName, employeeClass: _data.employeeClass == null ? null : _data.employeeClass, govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0), - age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0), + age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0, "GET"), dateEmployment: dateEmployment, dateAppoint: _data.dateAppoint, dateStart: _data.dateStart, diff --git a/src/interfaces/extension.ts b/src/interfaces/extension.ts index 26a12465..c81e66c0 100644 --- a/src/interfaces/extension.ts +++ b/src/interfaces/extension.ts @@ -309,11 +309,13 @@ class Extension { return years; } - public static CalculateAgeStrV2(date: Date, plusYear: number = 0, subtractYear: number = 0) { + public static CalculateAgeStrV2(date: Date, plusYear: number = 0, subtractYear: number = 0, method?:string) { if (date == null || date == undefined) return ""; const currentDate = new Date(); - if (date > currentDate) { + if (date > currentDate && method !== "GET") { throw new Error("วันเกิดต้องไม่มากกว่าวันที่ปัจจุบัน"); + }else if(date > currentDate && method === "GET"){ + return "" } let years = currentDate.getFullYear() - date.getFullYear();