This commit is contained in:
Bright 2024-03-25 16:36:41 +07:00
parent 2e273262de
commit 04d746bb18

View file

@ -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, //หมายเหตุ
};