From 04d746bb1817cb0ac395d7e7c83d485b90c3ba51 Mon Sep 17 00:00:00 2001 From: Bright Date: Mon, 25 Mar 2024 16:36:41 +0700 Subject: [PATCH] thai num --- src/controllers/ReportController.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 0c8fe1a..e295ae0 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -2580,9 +2580,9 @@ export class ReportController extends Controller { .filter((profileAPR) => profileAPR.citizenId === profile.citizenId) .map((profile) => ({ type: profile.type, isNext: profile.isNext, positionSalaryAmountPer: profile.positionSalaryAmountPer })); if(_profile[0].isNext){ - return _profile[0].positionSalaryAmountPer === 0.02 ? "2%" : _profile[0].positionSalaryAmountPer === 0.04 ? "4%": "6%" + return _profile[0].positionSalaryAmountPer === 0.02 ? "๒%" : _profile[0].positionSalaryAmountPer === 0.04 ? "๔%": "๖%" } - return _profile[0].type === "HALF" ? "0.5 ขั้น" : _profile[0].type === "FULL" ? "1 ขั้น" : "ไม่ได้เลื่อนขั้นฯ"; + return _profile[0].type === "HALF" ? "๐.๕ ขั้น" : _profile[0].type === "FULL" ? "๑ ขั้น" : "ไม่ได้เลื่อนขั้นฯ"; })() : null, //เมษา ปีก่อนหน้า type2: _salaryProfileEmpOCT.length > 0 @@ -2591,14 +2591,14 @@ export class ReportController extends Controller { .filter((profileOCT) => profileOCT.citizenId === profile.citizenId) .map((profile) => ({ type: profile.type, isNext: profile.isNext, positionSalaryAmountPer: profile.positionSalaryAmountPer })); if(_profile[0].isNext){ - return _profile[0].positionSalaryAmountPer === 0.02 ? "2%" : _profile[0].positionSalaryAmountPer === 0.04 ? "4%": "6%" + return _profile[0].positionSalaryAmountPer === 0.02 ? "๒%" : _profile[0].positionSalaryAmountPer === 0.04 ? "๔%": "๖%" } - return _profile[0].type === "HALF" ? "0.5 ขั้น" : _profile[0].type === "FULL" ? "1 ขั้น" : "ไม่ได้เลื่อนขั้นฯ"; + return _profile[0].type === "HALF" ? "๐.๕ ขั้น" : _profile[0].type === "FULL" ? "๑ ขั้น" : "ไม่ได้เลื่อนขั้นฯ"; })() : null, //ตุลา ปีก่อนหน้า type: profile.isNext === true - ? profile.positionSalaryAmountPer === 0.02 ? "2%" : profile.positionSalaryAmountPer === 0.04 ? "4%" : "6%" - : profile.type === "HALF" ? "0.5 ขั้น" : profile.type === "FULL" ? "1 ขั้น" : "ไม่ได้เลื่อนขั้นฯ", + ? profile.positionSalaryAmountPer === 0.02 ? "๒%" : profile.positionSalaryAmountPer === 0.04 ? "๔%" : "๖%" + : profile.type === "HALF" ? "๐.๕ ขั้น" : profile.type === "FULL" ? "๑ ขั้น" : "ไม่ได้เลื่อนขั้นฯ", score: null, //ผลการประเมิน remark: null, //หมายเหตุ };