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

kk1 date

Browse source
This commit is contained in:
mamoss 2025-05-13 13:07:52 +07:00
parent e4708c6f98
commit 0266dab4ac
2 changed files with 36 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/controllers/ProfileController.ts
View file

@ -1150,6 +1150,7 @@ export class ProfileController extends Controller {
"positionLevel", "positionLevel",
"positionSalaryAmount", "positionSalaryAmount",
"commandNo", "commandNo",
"positionCee",
"amount", "amount",
"remark", "remark",
], ],
@ -1176,12 +1177,11 @@ export class ProfileController extends Controller {
item.amount != null ? Extension.ToThaiNumber(item.amount.toLocaleString()) : null, item.amount != null ? Extension.ToThaiNumber(item.amount.toLocaleString()) : null,
rank: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null, rank: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null,
refAll: item.remark ? Extension.ToThaiNumber(item.remark) : null, refAll: item.remark ? Extension.ToThaiNumber(item.remark) : null,
positionLevel: positionLevel: item.positionLevel
item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel)
? Extension.ToThaiNumber(item.positionLevel) : item.positionCee
: item.positionCee != null ? Extension.ToThaiNumber(item.positionCee)
? Extension.ToThaiNumber(item.positionCee) : null,
: null,
positionType: item.positionType ?? null, positionType: item.positionType ?? null,
positionAmount: positionAmount:
item.positionSalaryAmount == null item.positionSalaryAmount == null
@ -1364,7 +1364,7 @@ export class ProfileController extends Controller {
childrenFirstName: item.childrenFirstName, childrenFirstName: item.childrenFirstName,
childrenLastName: item.childrenLastName, childrenLastName: item.childrenLastName,
childrenFullName: `${item.childrenPrefix}${item.childrenFirstName} ${item.childrenLastName}`, childrenFullName: `${item.childrenPrefix}${item.childrenFirstName} ${item.childrenLastName}`,
childrenLive: item.childrenLive == true ? "ถึงแก่กรรม" : "มีชีวิต", childrenLive: item.childrenLive == false ? "ถึงแก่กรรม" : "มีชีวิต",
})) }))
: [ : [
{ {
@ -1424,7 +1424,11 @@ export class ProfileController extends Controller {
: "", : "",
position: item.positionName, position: item.positionName,
posType: item.positionType, posType: item.positionType,
posLevel: item.positionLevel ? Extension.ToThaiNumber(item.positionLevel) : "", posLevel: item.positionLevel
? Extension.ToThaiNumber(item.positionLevel)
: item.positionCee
? Extension.ToThaiNumber(item.positionCee)
: null,
amount: item.amount ? Extension.ToThaiNumber(Number(item.amount).toLocaleString()) : "", amount: item.amount ? Extension.ToThaiNumber(Number(item.amount).toLocaleString()) : "",
positionSalaryAmount: item.positionSalaryAmount positionSalaryAmount: item.positionSalaryAmount
? Extension.ToThaiNumber(Number(item.positionSalaryAmount).toLocaleString()) ? Extension.ToThaiNumber(Number(item.positionSalaryAmount).toLocaleString())
@ -1530,7 +1534,7 @@ export class ProfileController extends Controller {
const assessments = const assessments =
assessments_raw.length > 0 assessments_raw.length > 0
? assessments_raw.map((item) => ({ ? assessments_raw.map((item) => ({
year: item.year ? Extension.ToThaiNumber(item.year + 543) : "", year: item.year ? Extension.ToThaiNumber((parseInt(item.year) + 543).toString()) : "",
period: item.period && item.period == "APR" ? "เมษายน" : "ตุลาคม", period: item.period && item.period == "APR" ? "เมษายน" : "ตุลาคม",
point1: item.point1 ? Extension.ToThaiNumber(item.point1.toString()) : "", point1: item.point1 ? Extension.ToThaiNumber(item.point1.toString()) : "",
point1Total: item.point1Total point1Total: item.point1Total
@ -1589,7 +1593,11 @@ export class ProfileController extends Controller {
: "", : "",
commandNo: item.commandNo ? Extension.ToThaiNumber(item.commandNo) : "", commandNo: item.commandNo ? Extension.ToThaiNumber(item.commandNo) : "",
position: item.positionName, position: item.positionName,
posLevel: item.positionLevel ? Extension.ToThaiNumber(item.positionLevel) : "", posLevel: item.positionLevel
? Extension.ToThaiNumber(item.positionLevel)
: item.positionCee
? Extension.ToThaiNumber(item.positionCee)
: null,
amount: item.amount ? Extension.ToThaiNumber(Number(item.amount).toLocaleString()) : "", amount: item.amount ? Extension.ToThaiNumber(Number(item.amount).toLocaleString()) : "",
})) }))
: [ : [

28
src/controllers/ProfileEmployeeController.ts
View file

@ -1148,6 +1148,7 @@ export class ProfileEmployeeController extends Controller {
"positionLevel", "positionLevel",
"positionSalaryAmount", "positionSalaryAmount",
"commandNo", "commandNo",
"positionCee",
"amount", "amount",
"remark", "remark",
], ],
@ -1174,12 +1175,11 @@ export class ProfileEmployeeController extends Controller {
item.amount != null ? Extension.ToThaiNumber(item.amount.toLocaleString()) : null, item.amount != null ? Extension.ToThaiNumber(item.amount.toLocaleString()) : null,
rank: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null, rank: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null,
refAll: item.remark ? Extension.ToThaiNumber(item.remark) : null, refAll: item.remark ? Extension.ToThaiNumber(item.remark) : null,
positionLevel: positionLevel: item.positionLevel
item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel)
? Extension.ToThaiNumber(item.positionLevel) : item.positionCee
: item.positionCee != null ? Extension.ToThaiNumber(item.positionCee)
? Extension.ToThaiNumber(item.positionCee) : null,
: null,
positionType: item.positionType ?? null, positionType: item.positionType ?? null,
positionAmount: positionAmount:
item.positionSalaryAmount == null item.positionSalaryAmount == null
@ -1362,7 +1362,7 @@ export class ProfileEmployeeController extends Controller {
childrenFirstName: item.childrenFirstName, childrenFirstName: item.childrenFirstName,
childrenLastName: item.childrenLastName, childrenLastName: item.childrenLastName,
childrenFullName: `${item.childrenPrefix}${item.childrenFirstName} ${item.childrenLastName}`, childrenFullName: `${item.childrenPrefix}${item.childrenFirstName} ${item.childrenLastName}`,
childrenLive: item.childrenLive == true ? "ถึงแก่กรรม" : "มีชีวิต", childrenLive: item.childrenLive == false ? "ถึงแก่กรรม" : "มีชีวิต",
})) }))
: [ : [
{ {
@ -1422,7 +1422,11 @@ export class ProfileEmployeeController extends Controller {
: "", : "",
position: item.positionName, position: item.positionName,
posType: item.positionType, posType: item.positionType,
posLevel: item.positionLevel ? Extension.ToThaiNumber(item.positionLevel) : "", posLevel: item.positionLevel
? Extension.ToThaiNumber(item.positionLevel)
: item.positionCee
? Extension.ToThaiNumber(item.positionCee)
: null,
amount: item.amount ? Extension.ToThaiNumber(Number(item.amount).toLocaleString()) : "", amount: item.amount ? Extension.ToThaiNumber(Number(item.amount).toLocaleString()) : "",
positionSalaryAmount: item.positionSalaryAmount positionSalaryAmount: item.positionSalaryAmount
? Extension.ToThaiNumber(Number(item.positionSalaryAmount).toLocaleString()) ? Extension.ToThaiNumber(Number(item.positionSalaryAmount).toLocaleString())
@ -1528,7 +1532,7 @@ export class ProfileEmployeeController extends Controller {
const assessments = const assessments =
assessments_raw.length > 0 assessments_raw.length > 0
? assessments_raw.map((item) => ({ ? assessments_raw.map((item) => ({
year: item.year ? Extension.ToThaiNumber(item.year + 543) : "", year: item.year ? Extension.ToThaiNumber((parseInt(item.year) + 543).toString()) : "",
period: item.period && item.period == "APR" ? "เมษายน" : "ตุลาคม", period: item.period && item.period == "APR" ? "เมษายน" : "ตุลาคม",
point1: item.point1 ? Extension.ToThaiNumber(item.point1.toString()) : "", point1: item.point1 ? Extension.ToThaiNumber(item.point1.toString()) : "",
point1Total: item.point1Total point1Total: item.point1Total
@ -1587,7 +1591,11 @@ export class ProfileEmployeeController extends Controller {
: "", : "",
commandNo: item.commandNo ? Extension.ToThaiNumber(item.commandNo) : "", commandNo: item.commandNo ? Extension.ToThaiNumber(item.commandNo) : "",
position: item.positionName, position: item.positionName,
posLevel: item.positionLevel ? Extension.ToThaiNumber(item.positionLevel) : "", posLevel: item.positionLevel
? Extension.ToThaiNumber(item.positionLevel)
: item.positionCee
? Extension.ToThaiNumber(item.positionCee)
: null,
amount: item.amount ? Extension.ToThaiNumber(Number(item.amount).toLocaleString()) : "", amount: item.amount ? Extension.ToThaiNumber(Number(item.amount).toLocaleString()) : "",
})) }))
: [ : [