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

sort order

Browse source
This commit is contained in:
moss 2025-04-05 18:12:02 +07:00
parent bf85af7e0d
commit 230b552f6d
15 changed files with 951 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

205
src/controllers/ReportController.ts
View file

@ -380,6 +380,7 @@ export class ReportController extends Controller {
posLevel: profile.posLevel,
posNumber:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
reason: null,
@ -432,7 +433,9 @@ export class ReportController extends Controller {
if (data1 != null) {
formattedData1 = {
total: Extension.ToThaiNumber(data1.total.toLocaleString()),
fifteenPercent: Extension.ToThaiNumber(`${data1.fifteenPercent.toLocaleString()}.${data1.fifteenPoint.toLocaleString()}`),
fifteenPercent: Extension.ToThaiNumber(
`${data1.fifteenPercent.toLocaleString()}.${data1.fifteenPoint.toLocaleString()}`,
),
full: Extension.ToThaiNumber(
data1.salaryProfiles.filter((x) => x.type == "FULL").length.toLocaleString(),
),
@ -450,7 +453,9 @@ export class ReportController extends Controller {
if (data2 != null) {
formattedData2 = {
total: Extension.ToThaiNumber(data2.total.toLocaleString()),
fifteenPercent: Extension.ToThaiNumber(`${data2.fifteenPercent.toLocaleString()}.${data2.fifteenPoint.toLocaleString()}`),
fifteenPercent: Extension.ToThaiNumber(
`${data2.fifteenPercent.toLocaleString()}.${data2.fifteenPoint.toLocaleString()}`,
),
full: Extension.ToThaiNumber(
data2.salaryProfiles
.filter(
@ -492,7 +497,9 @@ export class ReportController extends Controller {
if (data3 != null) {
formattedData3 = {
total: Extension.ToThaiNumber(data3.total.toLocaleString()),
fifteenPercent: Extension.ToThaiNumber(`${data3.fifteenPercent.toLocaleString()}.${data3.fifteenPoint.toLocaleString()}`),
fifteenPercent: Extension.ToThaiNumber(
`${data3.fifteenPercent.toLocaleString()}.${data3.fifteenPoint.toLocaleString()}`,
),
full: Extension.ToThaiNumber(
data3.salaryProfiles
.filter(
@ -537,7 +544,9 @@ export class ReportController extends Controller {
if (data4 != null) {
formattedData4 = {
total: Extension.ToThaiNumber(data4.total.toLocaleString()),
fifteenPercent: Extension.ToThaiNumber(`${data4.fifteenPercent.toLocaleString()}.${data4.fifteenPoint.toLocaleString()}`),
fifteenPercent: Extension.ToThaiNumber(
`${data4.fifteenPercent.toLocaleString()}.${data4.fifteenPoint.toLocaleString()}`,
),
full: Extension.ToThaiNumber(
data4.salaryProfiles.filter((x) => x.type == "FULL").length.toLocaleString(),
),
@ -632,8 +641,10 @@ export class ReportController extends Controller {
sixPercentAmount: Extension.ToThaiNumber(data1.sixPercentAmount.toLocaleString()),
spentAmount: Extension.ToThaiNumber(data1.spentAmount.toLocaleString()),
remainingAmount: Extension.ToThaiNumber(data1.remainingAmount.toLocaleString()),
fifteenPercentOld: Extension.ToThaiNumber(`${_salaryPeriodAPR2 == null ? 0 : _salaryPeriodAPR2.fifteenPercent.toLocaleString()}.${_salaryPeriodAPR2 == null ? 0: _salaryPeriodAPR2.fifteenPoint.toLocaleString()}`),
totalOld: Extension.ToThaiNumber(
fifteenPercentOld: Extension.ToThaiNumber(
`${_salaryPeriodAPR2 == null ? 0 : _salaryPeriodAPR2.fifteenPercent.toLocaleString()}.${_salaryPeriodAPR2 == null ? 0 : _salaryPeriodAPR2.fifteenPoint.toLocaleString()}`,
),
totalOld: Extension.ToThaiNumber(
(_salaryPeriodAPR2 == null || _salaryPeriodAPR2.salaryProfiles.length == 0
? 0
: _salaryPeriodAPR2.salaryProfiles.filter((x) => x.type == "FULL").length
@ -725,7 +736,9 @@ export class ReportController extends Controller {
sixPercentAmount: Extension.ToThaiNumber(data2.sixPercentAmount.toLocaleString()),
spentAmount: Extension.ToThaiNumber(data2.spentAmount.toLocaleString()),
remainingAmount: Extension.ToThaiNumber(data2.remainingAmount.toLocaleString()),
fifteenPercentOld: Extension.ToThaiNumber(`${_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent.toLocaleString()}.${_salaryPeriodAPR1 == null ? 0: _salaryPeriodAPR1.fifteenPoint.toLocaleString()}`),
fifteenPercentOld: Extension.ToThaiNumber(
`${_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent.toLocaleString()}.${_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPoint.toLocaleString()}`,
),
totalOld: Extension.ToThaiNumber(
(_salaryPeriodAPR1 == null || _salaryPeriodAPR1.salaryProfiles.length == 0
? 0
@ -859,7 +872,9 @@ export class ReportController extends Controller {
sixPercentAmount: Extension.ToThaiNumber(data3.sixPercentAmount.toLocaleString()),
spentAmount: Extension.ToThaiNumber(data3.spentAmount.toLocaleString()),
remainingAmount: Extension.ToThaiNumber(data3.remainingAmount.toLocaleString()),
fifteenPercentOld: Extension.ToThaiNumber(`${_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent.toLocaleString()}.${_salaryPeriodAPR1 == null ? 0: _salaryPeriodAPR1.fifteenPoint.toLocaleString()}`),
fifteenPercentOld: Extension.ToThaiNumber(
`${_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent.toLocaleString()}.${_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPoint.toLocaleString()}`,
),
totalOld: Extension.ToThaiNumber(
(_salaryPeriodAPR1 == null || _salaryPeriodAPR1.salaryProfiles.length == 0
? 0
@ -977,7 +992,9 @@ export class ReportController extends Controller {
sixPercentAmount: Extension.ToThaiNumber(data4.sixPercentAmount.toLocaleString()),
spentAmount: Extension.ToThaiNumber(data4.spentAmount.toLocaleString()),
remainingAmount: Extension.ToThaiNumber(data4.remainingAmount.toLocaleString()),
fifteenPercentOld: Extension.ToThaiNumber(`${_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent.toLocaleString()}.${_salaryPeriodAPR1 == null ? 0: _salaryPeriodAPR1.fifteenPoint.toLocaleString()}`),
fifteenPercentOld: Extension.ToThaiNumber(
`${_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent.toLocaleString()}.${_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPoint.toLocaleString()}`,
),
totalOld: Extension.ToThaiNumber(
(_salaryPeriodAPR1 == null || _salaryPeriodAPR1.salaryProfiles.length == 0
? 0
@ -1238,6 +1255,7 @@ export class ReportController extends Controller {
posLevel: item.posLevel,
posMasterNo:
Extension.ToThaiNumber(item.orgShortName) +
" " +
Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
amount:
item.amount == undefined || item.amount == null
@ -1289,6 +1307,7 @@ export class ReportController extends Controller {
posLevel: item.posLevel,
posMasterNo:
Extension.ToThaiNumber(item.orgShortName) +
" " +
Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
amount:
item.amount == undefined || item.amount == null
@ -1517,6 +1536,7 @@ export class ReportController extends Controller {
posLevel: item.posLevel,
posMasterNo:
Extension.ToThaiNumber(item.orgShortName) +
" " +
Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
amount:
item.amount == undefined || item.amount == null
@ -1597,6 +1617,7 @@ export class ReportController extends Controller {
posLevel: item.posLevel,
posMasterNo:
Extension.ToThaiNumber(item.orgShortName) +
" " +
Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
amount:
item.amount == undefined || item.amount == null
@ -1734,7 +1755,11 @@ export class ReportController extends Controller {
// (profile.child2 == undefined && profile.child2 == null ? "" : profile.child2 + " ") +
// (profile.child1 == undefined && profile.child1 == null ? "" : profile.child1 + " ") +
// (profile.root == undefined && profile.root == null ? "" : profile.root),
position: (profile.position?profile.position : "-") + (profile.posExecutive != null && profile.posExecutive != "" ? "\n" + profile.posExecutive : ""),
position:
(profile.position ? profile.position : "-") +
(profile.posExecutive != null && profile.posExecutive != ""
? "\n" + profile.posExecutive
: ""),
affiliation:
(profile.child4 == undefined && profile.child4 == null ? "" : profile.child4 + "\n") +
(profile.child3 == undefined && profile.child3 == null ? "" : profile.child3 + "\n") +
@ -1744,6 +1769,7 @@ export class ReportController extends Controller {
posLevel: profile.posLevel,
orgShortName:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(String(profile.posMasterNo.toLocaleString())),
amount:
profile.amount == undefined || profile.amount == null || profile.amount == 0
@ -1843,7 +1869,11 @@ export class ReportController extends Controller {
log_group: profile.salaryOrg.group,
log_type: profile.type,
log_isNext: profile.isNext,
position: (profile.position?profile.position : "-") + (profile.posExecutive != null && profile.posExecutive != "" ? "\n" + profile.posExecutive : ""),
position:
(profile.position ? profile.position : "-") +
(profile.posExecutive != null && profile.posExecutive != ""
? "\n" + profile.posExecutive
: ""),
affiliation:
(profile.child4 == undefined && profile.child4 == null ? "" : profile.child4 + "\n") +
(profile.child3 == undefined && profile.child3 == null ? "" : profile.child3 + "\n") +
@ -1853,6 +1883,7 @@ export class ReportController extends Controller {
posLevel: profile.posLevel,
orgShortName:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(String(profile.posMasterNo.toLocaleString())),
amount:
profile.amount == undefined || profile.amount == null || profile.amount == 0
@ -1959,11 +1990,16 @@ export class ReportController extends Controller {
return {
no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullname: profile.prefix + profile.firstName + " " + profile.lastName,
position: (profile.position?profile.position : "-") + (profile.posExecutive != null && profile.posExecutive != "" ? "\n" + profile.posExecutive : ""),
position:
(profile.position ? profile.position : "-") +
(profile.posExecutive != null && profile.posExecutive != ""
? "\n" + profile.posExecutive
: ""),
affiliation: affiliation,
posLevel: profile.posLevel,
posNumber:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
reason: profile.remark, //เหตุผล
@ -2053,12 +2089,17 @@ export class ReportController extends Controller {
return {
no: Extension.ToThaiNumber((index + 1).toLocaleString()),
fullname: profile.prefix + profile.firstName + " " + profile.lastName,
position: (profile.position?profile.position : "-") + (profile.posExecutive != null && profile.posExecutive != "" ? "\n" + profile.posExecutive : ""),
position:
(profile.position ? profile.position : "-") +
(profile.posExecutive != null && profile.posExecutive != ""
? "\n" + profile.posExecutive
: ""),
affiliation: affiliation,
posLevel: profile.posLevel,
posNumber:
profile.orgShortName || profile.posMasterNo
? Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString())
: "-",
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
@ -2150,7 +2191,9 @@ export class ReportController extends Controller {
const formattedData = salaryProfile.map((item, index) => ({
no: Extension.ToThaiNumber(String(index + 1)),
fullname: item.prefix + item.firstName + " " + item.lastName,
position: (item.position?item.position : "-") + (item.posExecutive != null && item.posExecutive != "" ? "\n" + item.posExecutive : ""),
position:
(item.position ? item.position : "-") +
(item.posExecutive != null && item.posExecutive != "" ? "\n" + item.posExecutive : ""),
affiliation:
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + "\n") +
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + "\n") +
@ -2165,6 +2208,7 @@ export class ReportController extends Controller {
: item.position || "-",
posMasterNo:
Extension.ToThaiNumber(item.orgShortName) +
" " +
Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
amount:
item.amount == undefined || item.amount == null
@ -2265,7 +2309,9 @@ export class ReportController extends Controller {
const formattedData = salaryProfile.map((item, index) => ({
no: Extension.ToThaiNumber(String(index + 1)),
fullname: item.prefix + item.firstName + " " + item.lastName,
position: (item.position?item.position : "-") + (item.posExecutive != null && item.posExecutive != "" ? "\n" + item.posExecutive : ""),
position:
(item.position ? item.position : "-") +
(item.posExecutive != null && item.posExecutive != "" ? "\n" + item.posExecutive : ""),
affiliation:
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + "\n") +
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + "\n") +
@ -2276,6 +2322,7 @@ export class ReportController extends Controller {
posLevel: item.posLevel,
posMasterNo:
Extension.ToThaiNumber(item.orgShortName) +
" " +
Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
amount:
item.amount == undefined || item.amount == null
@ -2416,7 +2463,9 @@ export class ReportController extends Controller {
const profileSpecial = salaryProfileSpecial.map((item, index) => ({
no: Extension.ToThaiNumber(String(index + 1)),
fullname: item.prefix + item.firstName + " " + item.lastName,
position: (item.position?item.position : "-") + (item.posExecutive != null && item.posExecutive != "" ? "\n" + item.posExecutive : ""),
position:
(item.position ? item.position : "-") +
(item.posExecutive != null && item.posExecutive != "" ? "\n" + item.posExecutive : ""),
affiliation:
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + "\n") +
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + "\n") +
@ -2427,6 +2476,7 @@ export class ReportController extends Controller {
posLevel: item.posLevel,
posMasterNo:
Extension.ToThaiNumber(item.orgShortName) +
" " +
Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
amount:
item.amount == undefined || item.amount == null
@ -2442,7 +2492,9 @@ export class ReportController extends Controller {
const profileNoAmount = salaryProfileNoAmount.map((item, index) => ({
no: Extension.ToThaiNumber(String(index + 1)),
fullname: item.prefix + item.firstName + " " + item.lastName,
position: (item.position?item.position : "-") + (item.posExecutive != null && item.posExecutive != "" ? "\n" + item.posExecutive : ""),
position:
(item.position ? item.position : "-") +
(item.posExecutive != null && item.posExecutive != "" ? "\n" + item.posExecutive : ""),
affiliation:
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + "\n") +
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + "\n") +
@ -2453,6 +2505,7 @@ export class ReportController extends Controller {
posLevel: item.posLevel,
posMasterNo:
Extension.ToThaiNumber(item.orgShortName) +
" " +
Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
amount:
item.amount == undefined || item.amount == null
@ -2569,9 +2622,12 @@ export class ReportController extends Controller {
no: Extension.ToThaiNumber(String(index + 1)),
fullname: item.prefix + item.firstName + " " + item.lastName,
root: item.root ?? "-",
position: (item.position?item.position : "-") + (item.posExecutive != null && item.posExecutive != "" ? "\n" + item.posExecutive : ""),
position:
(item.position ? item.position : "-") +
(item.posExecutive != null && item.posExecutive != "" ? "\n" + item.posExecutive : ""),
posMasterNo:
Extension.ToThaiNumber(item.orgShortName) +
" " +
Extension.ToThaiNumber(String(item.posMasterNo)),
posTypeCurrent: item.posType ?? "-",
posLevelCurrent: item.posLevel ?? "-",
@ -2666,7 +2722,9 @@ export class ReportController extends Controller {
fifteenPercent:
_salaryPeriod == null
? ""
: Extension.ToThaiNumber(`${_salaryPeriod.fifteenPercent.toLocaleString()}.${_salaryPeriod.fifteenPoint.toLocaleString()}`),
: Extension.ToThaiNumber(
`${_salaryPeriod.fifteenPercent.toLocaleString()}.${_salaryPeriod.fifteenPoint.toLocaleString()}`,
),
full:
_salaryPeriod == null
? ""
@ -2749,6 +2807,7 @@ export class ReportController extends Controller {
: null,
posNumber:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
reason: null,
@ -2847,6 +2906,7 @@ export class ReportController extends Controller {
posNumber:
profile.orgShortName || profile.posMasterNo
? Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString())
: "-",
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
@ -2932,8 +2992,9 @@ export class ReportController extends Controller {
? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
: "-",
posNumber:
profile.orgShortName || profile.amount
profile.orgShortName || profile.posMasterNo
? Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString())
: "-",
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
@ -3019,6 +3080,7 @@ export class ReportController extends Controller {
posNumber:
profile.orgShortName || profile.posMasterNo
? Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString())
: "-",
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
@ -3109,6 +3171,7 @@ export class ReportController extends Controller {
posNumber:
profile.orgShortName || profile.posMasterNo
? Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString())
: "-",
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
@ -3193,6 +3256,7 @@ export class ReportController extends Controller {
posNumber:
profile.orgShortName || profile.posMasterNo
? Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString())
: "-",
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
@ -3330,6 +3394,7 @@ export class ReportController extends Controller {
position: profile.position ?? "-",
posNumber:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "๐",
type1:
@ -3548,6 +3613,7 @@ export class ReportController extends Controller {
posLevel: profile.posLevel,
posNumber:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
reason: null,
@ -3627,6 +3693,7 @@ export class ReportController extends Controller {
posNumber:
profile.orgShortName || profile.posMasterNo
? Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString())
: "-",
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
@ -3714,6 +3781,7 @@ export class ReportController extends Controller {
posNumber:
profile.orgShortName || profile.posMasterNo
? Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString())
: "-",
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
@ -3795,6 +3863,7 @@ export class ReportController extends Controller {
posNumber:
profile.orgShortName || profile.posMasterNo
? Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString())
: "-",
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
@ -3874,6 +3943,7 @@ export class ReportController extends Controller {
posNumber:
profile.orgShortName || profile.posMasterNo
? Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString())
: "-",
amount: profile.positionSalaryAmount
@ -3963,6 +4033,7 @@ export class ReportController extends Controller {
posLevel: profile.posLevel,
posNumber:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
reason: null,
@ -4036,6 +4107,7 @@ export class ReportController extends Controller {
posLevel: profile.posLevel,
posNumber:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
reason: null,
@ -4199,8 +4271,9 @@ export class ReportController extends Controller {
(octSnap2.sixPercentAmount - octSnap2.spentAmount).toLocaleString(),
),
totalOld: aprSnap2 == null ? "" : Extension.ToThaiNumber(aprSnap2.total.toLocaleString()), //จำนวน(คน)(โควตาเลื่อนขั้นค่าจ้าง)
fifteenPercentOld:
Extension.ToThaiNumber(`${aprSnap2.fifteenPercent.toLocaleString()}.${aprSnap2.fifteenPoint.toLocaleString()}`),
fifteenPercentOld: Extension.ToThaiNumber(
`${aprSnap2.fifteenPercent.toLocaleString()}.${aprSnap2.fifteenPoint.toLocaleString()}`,
),
totalUseOld:
aprSnap2 == null ? "" : Extension.ToThaiNumber(aprSnap2.quantityUsed.toLocaleString()), //พิจารณาให้(คน)(โควตาเลื่อนขั้นค่าจ้าง)
full2: totalEmp2step == null ? "" : Extension.ToThaiNumber(totalEmp2step.toLocaleString()), //เลื่อนขั้นค่าจ้างรวมทั้งปีสองขั้นจำนวน(คน)
@ -4364,6 +4437,7 @@ export class ReportController extends Controller {
position: profile.position ?? "-",
posNumber:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
yearOld2:
@ -4621,6 +4695,7 @@ export class ReportController extends Controller {
posNumber:
profile.orgShortName || profile.posMasterNo
? Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(String(profile.posMasterNo.toLocaleString()))
: "-",
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
@ -4792,6 +4867,7 @@ export class ReportController extends Controller {
posNumber:
profile.orgShortName || profile.posMasterNo
? Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString())
: "-",
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
@ -4887,6 +4963,7 @@ export class ReportController extends Controller {
: "-",
posNumber:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
positionSalaryAmount: profile.positionSalaryAmount
? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
@ -4980,6 +5057,7 @@ export class ReportController extends Controller {
posNumber:
profile.orgShortName || profile.posMasterNo
? Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString())
: "-",
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
@ -5071,6 +5149,7 @@ export class ReportController extends Controller {
posNumber:
profile.orgShortName || profile.posMasterNo
? Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString())
: "-",
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
@ -5153,6 +5232,7 @@ export class ReportController extends Controller {
posLevel: profile.posLevel,
posNumber:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
reason: null,
@ -5279,6 +5359,7 @@ export class ReportController extends Controller {
posLevel: profile.posLevel,
posNumber:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
typeOld2:
@ -5443,6 +5524,7 @@ export class ReportController extends Controller {
: "-",
posNumber:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
positionSalaryAmount: profile.positionSalaryAmount
@ -5642,6 +5724,7 @@ export class ReportController extends Controller {
posLevel: profile.posLevel,
posNumber:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
positionSalaryAmount: profile.positionSalaryAmount
@ -5733,6 +5816,7 @@ export class ReportController extends Controller {
posLevel: profile.posLevel,
posNumber:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
positionSalaryAmount: profile.positionSalaryAmount
@ -5816,6 +5900,7 @@ export class ReportController extends Controller {
: null,
posNumber:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
reason: null,
@ -5932,6 +6017,7 @@ export class ReportController extends Controller {
posNumber:
profile.orgShortName || profile.posMasterNo
? Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString())
: "-",
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
@ -6027,6 +6113,7 @@ export class ReportController extends Controller {
: "-",
posNumber:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
positionSalaryAmount: profile.positionSalaryAmount
@ -6127,6 +6214,7 @@ export class ReportController extends Controller {
: "-",
posNumber:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
positionSalaryAmount: profile.positionSalaryAmount
? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
@ -6223,6 +6311,7 @@ export class ReportController extends Controller {
posNumber:
profile.orgShortName || profile.posMasterNo
? Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString())
: "-",
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
@ -6333,6 +6422,7 @@ export class ReportController extends Controller {
: null,
posNumber:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
reason: null,
@ -6558,6 +6648,7 @@ export class ReportController extends Controller {
: "-",
posNumber:
Extension.ToThaiNumber(profile.orgShortName) +
" " +
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
positionSalaryAmount: profile.positionSalaryAmount
@ -6931,7 +7022,7 @@ export class ReportController extends Controller {
const _salaryRank = salaryRank.map((item) => ({
id: item.id,
posMasterNo: `${item.orgShortName}${item.posMasterNo}`,
posMasterNo: `${item.orgShortName} ${item.posMasterNo}`,
positionName: item.position,
posType: item.posType,
posLevel: item.posLevel,
@ -6981,7 +7072,7 @@ export class ReportController extends Controller {
const _salaryRank = salaryRank.map((item) => ({
id: item.id,
posMasterNo: `${item.orgShortName}${item.posMasterNo}`,
posMasterNo: `${item.orgShortName} ${item.posMasterNo}`,
positionName: item.position,
posType: item.posType,
posLevel: item.posLevel,
@ -7025,7 +7116,7 @@ export class ReportController extends Controller {
const _salaryRank = salaryRank.map((item) => ({
id: item.id,
posMasterNo: `${item.orgShortName}${item.posMasterNo}`,
posMasterNo: `${item.orgShortName} ${item.posMasterNo}`,
positionName: item.position,
posType: item.posType,
posLevel: item.posLevel,
@ -7068,7 +7159,7 @@ export class ReportController extends Controller {
const _salaryRank = salaryRank.map((item) => ({
id: item.id,
posMasterNo: `${item.orgShortName}${item.posMasterNo}`,
posMasterNo: `${item.orgShortName} ${item.posMasterNo}`,
positionName: item.position,
posType: item.posType,
posLevel: `${item.posTypeShort}${item.posLevel}`,
@ -7111,7 +7202,7 @@ export class ReportController extends Controller {
const _salaryRank = salaryRank.map((item) => ({
id: item.id,
posMasterNo: `${item.orgShortName}${item.posMasterNo}`,
posMasterNo: `${item.orgShortName} ${item.posMasterNo}`,
positionName: item.position,
posType: item.posType,
posLevel: `${item.posTypeShort}${item.posLevel}`,
@ -7197,11 +7288,17 @@ export class ReportController extends Controller {
"salaryProfile.amountUse",
"salaryProfile.positionSalaryAmount",
])
.orderBy("salaryProfile.rootOrder", "ASC")
.addOrderBy("salaryProfile.child1Order", "ASC")
.addOrderBy("salaryProfile.child2Order", "ASC")
.addOrderBy("salaryProfile.child3Order", "ASC")
.addOrderBy("salaryProfile.child4Order", "ASC")
.addOrderBy("salaryProfile.posMasterNo", "ASC")
.getMany();
const _salaryRank = salaryRank.map((item) => ({
id: item.id,
posMasterNo: `${item.orgShortName}${item.posMasterNo}`,
posMasterNo: `${item.orgShortName} ${item.posMasterNo}`,
positionName: item.position,
posType: item.posType,
posLevel: item.posLevel,
@ -7300,11 +7397,17 @@ export class ReportController extends Controller {
"salaryProfile.amountUse",
"salaryProfile.positionSalaryAmount",
])
.orderBy("salaryProfile.rootOrder", "ASC")
.addOrderBy("salaryProfile.child1Order", "ASC")
.addOrderBy("salaryProfile.child2Order", "ASC")
.addOrderBy("salaryProfile.child3Order", "ASC")
.addOrderBy("salaryProfile.child4Order", "ASC")
.addOrderBy("salaryProfile.posMasterNo", "ASC")
.getMany();
const _salaryRank = salaryRank.map((item) => ({
id: item.id,
posMasterNo: `${item.orgShortName}${item.posMasterNo}`,
posMasterNo: `${item.orgShortName} ${item.posMasterNo}`,
positionName: item.position,
posType: item.posType,
posLevel: item.posLevel,
@ -7395,11 +7498,17 @@ export class ReportController extends Controller {
"salaryProfile.amountUse",
"salaryProfile.positionSalaryAmount",
])
.orderBy("salaryProfile.rootOrder", "ASC")
.addOrderBy("salaryProfile.child1Order", "ASC")
.addOrderBy("salaryProfile.child2Order", "ASC")
.addOrderBy("salaryProfile.child3Order", "ASC")
.addOrderBy("salaryProfile.child4Order", "ASC")
.addOrderBy("salaryProfile.posMasterNo", "ASC")
.getMany();
const _salaryRank = salaryRank.map((item) => ({
id: item.id,
posMasterNo: `${item.orgShortName}${item.posMasterNo}`,
posMasterNo: `${item.orgShortName} ${item.posMasterNo}`,
positionName: item.position,
posType: item.posType,
posLevel: item.posLevel,
@ -7490,11 +7599,17 @@ export class ReportController extends Controller {
"salaryProfileEmployee.amountUse",
"salaryProfileEmployee.positionSalaryAmount",
])
.orderBy("salaryProfile.rootOrder", "ASC")
.addOrderBy("salaryProfile.child1Order", "ASC")
.addOrderBy("salaryProfile.child2Order", "ASC")
.addOrderBy("salaryProfile.child3Order", "ASC")
.addOrderBy("salaryProfile.child4Order", "ASC")
.addOrderBy("salaryProfile.posMasterNo", "ASC")
.getMany();
const _salaryRank = salaryRank.map((item) => ({
id: item.id,
posMasterNo: `${item.orgShortName}${item.posMasterNo}`,
posMasterNo: `${item.orgShortName} ${item.posMasterNo}`,
positionName: item.position,
posType: item.posType,
posLevel: `${item.posTypeShort ?? ""} ${item.posLevel ?? ""}`,
@ -7585,11 +7700,17 @@ export class ReportController extends Controller {
"salaryProfileEmployee.amountUse",
"salaryProfileEmployee.positionSalaryAmount",
])
.orderBy("salaryProfile.rootOrder", "ASC")
.addOrderBy("salaryProfile.child1Order", "ASC")
.addOrderBy("salaryProfile.child2Order", "ASC")
.addOrderBy("salaryProfile.child3Order", "ASC")
.addOrderBy("salaryProfile.child4Order", "ASC")
.addOrderBy("salaryProfile.posMasterNo", "ASC")
.getMany();
const _salaryRank = salaryRank.map((item) => ({
id: item.id,
posMasterNo: `${item.orgShortName}${item.posMasterNo}`,
posMasterNo: `${item.orgShortName} ${item.posMasterNo}`,
positionName: item.position,
posType: item.posType,
posLevel: `${item.posTypeShort ?? ""} ${item.posLevel ?? ""}`,
@ -7854,7 +7975,7 @@ export class ReportController extends Controller {
: "-",
positionNumber:
salary.orgShortName != null && salary.posMasterNo != null
? Extension.ToThaiNumber(salary.orgShortName + salary.posMasterNo)
? Extension.ToThaiNumber(salary.orgShortName + " " + salary.posMasterNo)
: "-",
amount: salary.amount ? Extension.ToThaiNumber(salary.amount.toLocaleString()) : "-",
positionSalaryAmount: salary.positionSalaryAmount
@ -7984,7 +8105,7 @@ export class ReportController extends Controller {
: "-",
positionNumber:
salary.orgShortName != null && salary.posMasterNo != null
? Extension.ToThaiNumber(salary.orgShortName + salary.posMasterNo)
? Extension.ToThaiNumber(salary.orgShortName + " " + salary.posMasterNo)
: "-",
amount: salary.amount ? Extension.ToThaiNumber(salary.amount.toLocaleString()) : "-",
positionSalaryAmount: salary.positionSalaryAmount
@ -8114,7 +8235,7 @@ export class ReportController extends Controller {
: "-",
positionNumber:
salary.orgShortName != null && salary.posMasterNo != null
? Extension.ToThaiNumber(salary.orgShortName + salary.posMasterNo)
? Extension.ToThaiNumber(salary.orgShortName + " " + salary.posMasterNo)
: "-",
amount: salary.amount ? Extension.ToThaiNumber(salary.amount.toLocaleString()) : "-",
positionSalaryAmount: salary.positionSalaryAmount
@ -8244,7 +8365,7 @@ export class ReportController extends Controller {
: "-",
positionNumber:
salary.orgShortName != null && salary.posMasterNo != null
? Extension.ToThaiNumber(salary.orgShortName + salary.posMasterNo)
? Extension.ToThaiNumber(salary.orgShortName + " " + salary.posMasterNo)
: "-",
amount: salary.amount ? Extension.ToThaiNumber(salary.amount.toLocaleString()) : "-",
positionSalaryAmount: salary.positionSalaryAmount
@ -8374,7 +8495,7 @@ export class ReportController extends Controller {
: "-",
positionNumber:
salary.orgShortName != null && salary.posMasterNo != null
? Extension.ToThaiNumber(salary.orgShortName + salary.posMasterNo)
? Extension.ToThaiNumber(salary.orgShortName + " " + salary.posMasterNo)
: "-",
amount: salary.amount ? Extension.ToThaiNumber(salary.amount.toLocaleString()) : "-",
positionSalaryAmount: salary.positionSalaryAmount
@ -8678,7 +8799,7 @@ export class ReportController extends Controller {
id: v.refId,
},
});
if (salary != null) {
await new CallAPI()
.PostData(request, "/org/profile-employee/salary/update", {
@ -8693,7 +8814,9 @@ export class ReportController extends Controller {
posNoAbb: salary.orgShortName,
positionName: salary.position,
positionType: salary.posType,
positionLevel: (salary.posTypeShort != null ? salary.posTypeShort + " " : '') + (salary.posLevel != null ? salary.posLevel.toString() : ''),
positionLevel:
(salary.posTypeShort != null ? salary.posTypeShort + " " : "") +
(salary.posLevel != null ? salary.posLevel.toString() : ""),
remark: v.remark,
orgRoot: salary.root,
orgChild1: salary.child1,
@ -8778,7 +8901,9 @@ export class ReportController extends Controller {
posNoAbb: salary.orgShortName,
positionName: salary.position,
positionType: salary.posType,
positionLevel: (salary.posTypeShort != null ? salary.posTypeShort + " " : '') + (salary.posLevel != null ? salary.posLevel.toString() : ''),
positionLevel:
(salary.posTypeShort != null ? salary.posTypeShort + " " : "") +
(salary.posLevel != null ? salary.posLevel.toString() : ""),
remark: v.remark,
orgRoot: salary.root,
orgChild1: salary.child1,