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

#170 and calAge

Browse source
This commit is contained in:
Adisak 2025-10-02 14:37:25 +07:00
parent a45d3744e5
commit 4be0b068bc
5 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/OrganizationDotnetController.ts
View file

@ -5521,7 +5521,7 @@ export class OrganizationDotnetController extends Controller {
govAge: profile.dateAppoint govAge: profile.dateAppoint
? `${Extension.CalculateGovAge(profile.dateAppoint, 0, 0)} ปี` ? `${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, dateAppoint: profile.dateAppoint,
dateCurrent: new Date(), dateCurrent: new Date(),
amount: profile.amount ?? "-", amount: profile.amount ?? "-",
@ -5636,7 +5636,7 @@ export class OrganizationDotnetController extends Controller {
govAge: profile.dateAppoint govAge: profile.dateAppoint
? `${Extension.CalculateGovAge(profile.dateAppoint, 0, 0)} ปี` ? `${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, dateAppoint: profile.dateAppoint,
dateCurrent: new Date(), dateCurrent: new Date(),
amount: profile.amount ?? "-", amount: profile.amount ?? "-",

6
src/controllers/ProfileEmployeeController.ts
View file

@ -2127,7 +2127,7 @@ export class ProfileEmployeeController extends Controller {
posNo: _data.employeeClass == "TEMP" ? _data.posMasterNoTemp : shortName, posNo: _data.employeeClass == "TEMP" ? _data.posMasterNoTemp : shortName,
employeeClass: _data.employeeClass == null ? null : _data.employeeClass, employeeClass: _data.employeeClass == null ? null : _data.employeeClass,
govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0), govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0),
age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0), age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0, "GET"),
dateEmployment: dateEmployment, dateEmployment: dateEmployment,
dateAppoint: _data.dateAppoint, dateAppoint: _data.dateAppoint,
dateStart: _data.dateStart, dateStart: _data.dateStart,
@ -2995,7 +2995,7 @@ export class ProfileEmployeeController extends Controller {
: _data.profileSalary[0].posNo || "", : _data.profileSalary[0].posNo || "",
employeeClass: _data.employeeClass == null ? null : _data.employeeClass, employeeClass: _data.employeeClass == null ? null : _data.employeeClass,
govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0), govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0),
age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0), age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0, "GET"),
dateEmployment: dateEmployment, dateEmployment: dateEmployment,
dateAppoint: _data.dateAppoint, dateAppoint: _data.dateAppoint,
dateStart: _data.dateStart, dateStart: _data.dateStart,
@ -3417,7 +3417,7 @@ export class ProfileEmployeeController extends Controller {
posNo: _data.employeeClass == "TEMP" ? _data.posMasterNoTemp : shortName, posNo: _data.employeeClass == "TEMP" ? _data.posMasterNoTemp : shortName,
employeeClass: _data.employeeClass == null ? null : _data.employeeClass, employeeClass: _data.employeeClass == null ? null : _data.employeeClass,
govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0), govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0),
age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0), age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0, "GET"),
dateEmployment: dateEmployment, dateEmployment: dateEmployment,
dateAppoint: _data.dateAppoint, dateAppoint: _data.dateAppoint,
dateStart: _data.dateStart, dateStart: _data.dateStart,

4
src/controllers/ProfileEmployeeTempController.ts
View file

@ -1189,7 +1189,7 @@ export class ProfileEmployeeTempController extends Controller {
posNo: _data.employeeClass == "TEMP" ? _data.posMasterNoTemp : shortName, posNo: _data.employeeClass == "TEMP" ? _data.posMasterNoTemp : shortName,
employeeClass: _data.employeeClass == null ? null : _data.employeeClass, employeeClass: _data.employeeClass == null ? null : _data.employeeClass,
govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0), govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0),
age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0), age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0, "GET"),
dateEmployment: dateEmployment, dateEmployment: dateEmployment,
dateAppoint: _data.dateAppoint, dateAppoint: _data.dateAppoint,
dateStart: _data.dateStart, dateStart: _data.dateStart,
@ -1724,7 +1724,7 @@ export class ProfileEmployeeTempController extends Controller {
posNo: _data.employeeClass == "TEMP" ? _data.posMasterNoTemp : shortName, posNo: _data.employeeClass == "TEMP" ? _data.posMasterNoTemp : shortName,
employeeClass: _data.employeeClass == null ? null : _data.employeeClass, employeeClass: _data.employeeClass == null ? null : _data.employeeClass,
govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0), govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0),
age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0), age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0, "GET"),
dateEmployment: dateEmployment, dateEmployment: dateEmployment,
dateAppoint: _data.dateAppoint, dateAppoint: _data.dateAppoint,
dateStart: _data.dateStart, dateStart: _data.dateStart,

2
src/controllers/ProfileSalaryTempController.ts
View file

@ -878,7 +878,7 @@ export class ProfileSalaryTempController extends Controller {
posNo: _data.employeeClass == "TEMP" ? _data.posMasterNoTemp : shortName, posNo: _data.employeeClass == "TEMP" ? _data.posMasterNoTemp : shortName,
employeeClass: _data.employeeClass == null ? null : _data.employeeClass, employeeClass: _data.employeeClass == null ? null : _data.employeeClass,
govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0), govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0),
age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0), age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0, "GET"),
dateEmployment: dateEmployment, dateEmployment: dateEmployment,
dateAppoint: _data.dateAppoint, dateAppoint: _data.dateAppoint,
dateStart: _data.dateStart, dateStart: _data.dateStart,

6
src/interfaces/extension.ts
View file

@ -309,11 +309,13 @@ class Extension {
return years; 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 ""; if (date == null || date == undefined) return "";
const currentDate = new Date(); const currentDate = new Date();
if (date > currentDate) { if (date > currentDate && method !== "GET") {
throw new Error("วันเกิดต้องไม่มากกว่าวันที่ปัจจุบัน"); throw new Error("วันเกิดต้องไม่มากกว่าวันที่ปัจจุบัน");
}else if(date > currentDate && method === "GET"){
return ""
} }
let years = currentDate.getFullYear() - date.getFullYear(); let years = currentDate.getFullYear() - date.getFullYear();