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

issue แปลงเอาเลขไทย #1249 && เอาเดือนออก #1248

Browse source
This commit is contained in:
Bright 2025-03-17 13:43:54 +07:00
parent a03ce9d55a
commit b0358de9cb
4 changed files with 43 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/controllers/ProfileEmployeeTempController.ts
View file

@ -256,17 +256,17 @@ export class ProfileEmployeeTempController extends Controller {
: null,
position: Extension.ToThaiNumber(
Extension.ToThaiNumber(
`${item.positionName != null ? item.positionName : "-"} ${item.positionType == null ? item.positionCee : (item.positionType == "อำนวยการ" || item.positionType == "บริหาร" ? item.positionType : "") + item.positionLevel}`,
`${item.positionName != null ? item.positionName : "-"} ${item.positionType == null ? (item.positionCee??"") : (item.positionType == "อำนวยการ" || item.positionType == "บริหาร" ? item.positionType : "") + item.positionLevel}`,
),
),
posNo: item.posNo != null ? Extension.ToThaiNumber(item.posNo) : null,
orgRoot: item.orgRoot,
orgChild1: item.orgChild1,
orgChild2: item.orgChild2,
orgChild3: item.orgChild3,
orgChild4: item.orgChild4,
positionCee: item.positionCee,
positionExecutive: item.positionExecutive,
posNo: item.posNo != null ? Extension.ToThaiNumber(item.posNo) : "",
orgRoot: item.orgRoot != null ? Extension.ToThaiNumber( item.orgRoot) : "",
orgChild1: item.orgChild1 != null ? Extension.ToThaiNumber( item.orgChild1) : "",
orgChild2: item.orgChild2 != null ? Extension.ToThaiNumber( item.orgChild2) : "",
orgChild3: item.orgChild3 != null ? Extension.ToThaiNumber( item.orgChild3) : "",
orgChild4: item.orgChild4 != null ? Extension.ToThaiNumber( item.orgChild4) : "",
positionCee: item.positionCee != null ? Extension.ToThaiNumber( item.positionCee) : "",
positionExecutive: item.positionExecutive != null ? Extension.ToThaiNumber( item.positionExecutive) : "",
}))
: [
{
@ -314,11 +314,11 @@ export class ProfileEmployeeTempController extends Controller {
citizenId: profile.citizenId != null ? Extension.ToThaiNumber(profile.citizenId) : "",
dateOfBirth:
profile.birthDate != null
? Extension.ToThaiNumber(Extension.ToThaiShortDate_monthYear(profile.birthDate))
? Extension.ToThaiNumber(Extension.ToThaiShortDate_monthYear2(profile.birthDate))
: "",
dateRetire:
profile.dateRetire != null
? Extension.ToThaiNumber(Extension.ToThaiShortDate_monthYear(profile.dateRetire))
? Extension.ToThaiNumber(Extension.ToThaiShortDate_monthYear2(profile.dateRetire))
: "",
salaryAmount:
profile.amount != null ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "",
@ -342,7 +342,7 @@ export class ProfileEmployeeTempController extends Controller {
salary_raw.length > 0 && salary_raw[0].positionName != null
? Extension.ToThaiNumber(
Extension.ToThaiNumber(
`${salary_raw[0].positionName != null ? salary_raw[0].positionName : "-"} ${salary_raw[0].positionType == null ? salary_raw[0].positionCee : (salary_raw[0].positionType == "อำนวยการ" || salary_raw[0].positionType == "บริหาร" ? salary_raw[0].positionType : "") + salary_raw[0].positionLevel}`,
`${salary_raw[0].positionName != null ? salary_raw[0].positionName : "-"} ${salary_raw[0].positionType == null ? (salary_raw[0].positionCee??"") : (salary_raw[0].positionType == "อำนวยการ" || salary_raw[0].positionType == "บริหาร" ? salary_raw[0].positionType : "") + salary_raw[0].positionLevel}`,
),
)
: "",