fix report
This commit is contained in:
parent
2a524305bf
commit
389b64d4ee
1 changed files with 47 additions and 59 deletions
|
|
@ -1715,7 +1715,7 @@ export class ReportController extends Controller {
|
|||
profile.amountSpecial == 0
|
||||
? ""
|
||||
: `(${Extension.ToThaiNumber(String(profile.amountSpecial.toLocaleString()))})`),
|
||||
score: profile.result, //สรุปผลการประเมินฯ ระดับและคะแนน
|
||||
score: profile.result?Extension.ToThaiNumber(profile.result):"-", //สรุปผลการประเมินฯ ระดับและคะแนน
|
||||
remark:
|
||||
`${profile.type === "FULL" ? "หนึ่งขั้น" : ""}\n` +
|
||||
`${profile.type === "FULLHAFT" ? "หนึ่งขั้นครึ่ง" : ""}\n` +
|
||||
|
|
@ -1824,7 +1824,7 @@ export class ReportController extends Controller {
|
|||
profile.amountSpecial == 0
|
||||
? ""
|
||||
: `(${Extension.ToThaiNumber(String(profile.amountSpecial.toLocaleString()))})`),
|
||||
score: profile.result, //สรุปผลการประเมินฯ ระดับและคะแนน
|
||||
score: profile.result?Extension.ToThaiNumber(profile.result):"-", //สรุปผลการประเมินฯ ระดับและคะแนน
|
||||
remark:
|
||||
`${profile.type === "FULL" ? "หนึ่งขั้น" : ""}\n` +
|
||||
`${profile.type === "FULLHAFT" ? "หนึ่งขั้นครึ่ง" : ""}\n` +
|
||||
|
|
@ -1921,9 +1921,9 @@ export class ReportController extends Controller {
|
|||
Extension.ToThaiNumber(profile.orgShortName) +
|
||||
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
|
||||
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
|
||||
reason: null, //เหตุผล
|
||||
score: profile.result, //สรุปผลการประเมินฯ ระดับและคะแนน
|
||||
remark: profile.remark, //หมายเหตุ
|
||||
reason: profile.remark, //เหตุผล
|
||||
score: profile.result?Extension.ToThaiNumber(profile.result):"-", //สรุปผลการประเมินฯ ระดับและคะแนน
|
||||
remark: null, //หมายเหตุ
|
||||
};
|
||||
});
|
||||
|
||||
|
|
@ -2016,7 +2016,7 @@ export class ReportController extends Controller {
|
|||
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
|
||||
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
|
||||
reason: null, //เหตุผล
|
||||
score: profile.result, //สรุปผลการประเมินฯ ระดับและคะแนน
|
||||
score: profile.result?Extension.ToThaiNumber(profile.result):"-", //สรุปผลการประเมินฯ ระดับและคะแนน
|
||||
remark: profile.remark, //หมายเหตุ
|
||||
};
|
||||
});
|
||||
|
|
@ -2643,7 +2643,7 @@ export class ReportController extends Controller {
|
|||
Extension.ToThaiNumber(profile.orgShortName) +
|
||||
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
|
||||
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
|
||||
score: profile.result,
|
||||
score: profile.result?Extension.ToThaiNumber(profile.result):"-",
|
||||
reason: profile.remark,
|
||||
};
|
||||
});
|
||||
|
|
@ -2723,15 +2723,15 @@ export class ReportController extends Controller {
|
|||
position: profile.position,
|
||||
posLevel: profile.posLevel
|
||||
? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
|
||||
: null,
|
||||
posNumber:
|
||||
: "-",
|
||||
posNumber: profile.orgShortName || profile.amount?
|
||||
Extension.ToThaiNumber(profile.orgShortName) +
|
||||
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
|
||||
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
|
||||
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()):"-",
|
||||
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
|
||||
positionSalaryAmount: profile.positionSalaryAmount
|
||||
? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
|
||||
: null,
|
||||
score: profile.result, //สรุปผลการประเมินฯ ระดับและคะแนน
|
||||
: "-",
|
||||
score: profile.result?Extension.ToThaiNumber(profile.result):"-", //สรุปผลการประเมินฯ ระดับและคะแนน
|
||||
reason: profile.remark,
|
||||
};
|
||||
});
|
||||
|
|
@ -2805,21 +2805,21 @@ export class ReportController extends Controller {
|
|||
position: profile.position,
|
||||
posLevel: profile.posLevel
|
||||
? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
|
||||
: null,
|
||||
: "-",
|
||||
posNumber:
|
||||
Extension.ToThaiNumber(profile.orgShortName) +
|
||||
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
|
||||
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
|
||||
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
|
||||
positionSalaryAmount: profile.positionSalaryAmount
|
||||
? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
|
||||
: null,
|
||||
: "-",
|
||||
amountSpecialFormated:
|
||||
profile.amountSpecial > 0
|
||||
? "(" + Extension.ToThaiNumber(profile.amountSpecial.toString()) + ")"
|
||||
: "",
|
||||
amountSpecial:
|
||||
profile.amountSpecial > 0 ? Extension.ToThaiNumber(profile.amountSpecial.toLocaleString()) : "",
|
||||
score: profile.result, //สรุปผลการประเมินฯ ระดับและคะแนน
|
||||
score: profile.result?Extension.ToThaiNumber(profile.result):"-", //สรุปผลการประเมินฯ ระดับและคะแนน
|
||||
reason: profile.remark,
|
||||
};
|
||||
});
|
||||
|
|
@ -2891,16 +2891,16 @@ export class ReportController extends Controller {
|
|||
position: profile.position,
|
||||
posLevel: profile.posLevel
|
||||
? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
|
||||
: null,
|
||||
: "-",
|
||||
posNumber:
|
||||
Extension.ToThaiNumber(profile.orgShortName) +
|
||||
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
|
||||
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
|
||||
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
|
||||
positionSalaryAmount: profile.positionSalaryAmount
|
||||
? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
|
||||
: null,
|
||||
reasonSign: null,
|
||||
score: profile.result, //สรุปผลการประเมินฯ ระดับและคะแนน
|
||||
: "-",
|
||||
reasonSign: "-",
|
||||
score: profile.result?Extension.ToThaiNumber(profile.result):"-", //สรุปผลการประเมินฯ ระดับและคะแนน
|
||||
reason: profile.remark, //เหตุผลที่ไม่สมควรหรือไม่อาจเลื่อนขั้นค่าจ้าง
|
||||
};
|
||||
});
|
||||
|
|
@ -2982,7 +2982,7 @@ export class ReportController extends Controller {
|
|||
? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
|
||||
: "-",
|
||||
reasonSign: "-",
|
||||
score: profile.result??"-", //สรุปผลการประเมินฯ ระดับและคะแนน
|
||||
score: profile.result?Extension.ToThaiNumber(profile.result):"-", //สรุปผลการประเมินฯ ระดับและคะแนน
|
||||
reason: profile.remark, //เหตุผลที่ไม่สมควรหรือไม่อาจเลื่อนขั้นค่าจ้าง
|
||||
};
|
||||
});
|
||||
|
|
@ -3174,7 +3174,7 @@ export class ReportController extends Controller {
|
|||
: profile.type === "FULL"
|
||||
? "๑ ขั้น"
|
||||
: "ไม่ได้เลื่อนขั้นฯ",
|
||||
score: profile.result, //ผลการประเมิน
|
||||
score: profile.result?Extension.ToThaiNumber(profile.result):"-", //ผลการประเมิน
|
||||
remark: profile.remark, //หมายเหตุ
|
||||
};
|
||||
});
|
||||
|
|
@ -3250,10 +3250,10 @@ export class ReportController extends Controller {
|
|||
no: Extension.ToThaiNumber((index + 1).toLocaleString()),
|
||||
fullName: fullName,
|
||||
affiliation: affiliation,
|
||||
position: profile.position,
|
||||
position: profile.position??"-",
|
||||
posLevel: profile.posLevel
|
||||
? Extension.ToThaiNumber(String(profile.posLevel.toLocaleString()))
|
||||
: null,
|
||||
: "-",
|
||||
};
|
||||
});
|
||||
|
||||
|
|
@ -3401,15 +3401,15 @@ export class ReportController extends Controller {
|
|||
position: profile.position,
|
||||
posLevel: profile.posLevel
|
||||
? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
|
||||
: null,
|
||||
posNumber:
|
||||
: "-",
|
||||
posNumber: profile.orgShortName || profile.posMasterNo ?
|
||||
Extension.ToThaiNumber(profile.orgShortName) +
|
||||
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
|
||||
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
|
||||
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()):"-",
|
||||
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
|
||||
positionSalaryAmount: profile.positionSalaryAmount
|
||||
? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
|
||||
: null,
|
||||
score: profile.result, //สรุปผลการประเมินฯ ระดับและคะแนน
|
||||
: "-",
|
||||
score: profile.result?Extension.ToThaiNumber(profile.result):"-", //สรุปผลการประเมินฯ ระดับและคะแนน
|
||||
remark:
|
||||
`${profile.type === "FULL" ? "หนึ่งขั้น" : ""}\n` +
|
||||
`${profile.type === "FULLHAFT" ? "หนึ่งขั้นครึ่ง" : ""}\n` +
|
||||
|
|
@ -3486,12 +3486,12 @@ export class ReportController extends Controller {
|
|||
position: profile.position,
|
||||
posLevel: profile.posLevel
|
||||
? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
|
||||
: null,
|
||||
posNumber:
|
||||
: "-",
|
||||
posNumber:profile.orgShortName || profile.posMasterNo ?
|
||||
Extension.ToThaiNumber(profile.orgShortName) +
|
||||
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
|
||||
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
|
||||
score: profile.result, //สรุปผลการประเมินฯ ระดับและคะแนน
|
||||
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()):"-",
|
||||
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
|
||||
score: profile.result?Extension.ToThaiNumber(profile.result):"-", //สรุปผลการประเมินฯ ระดับและคะแนน
|
||||
reason: profile.remark, // หมายเหตุ
|
||||
};
|
||||
});
|
||||
|
|
@ -4513,15 +4513,15 @@ 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),
|
||||
posLevel: profile.posLevel,
|
||||
posNumber:
|
||||
posLevel: profile.posLevel? Extension.ToThaiNumber(profile.posLevel.toLocaleString()): "-",
|
||||
posNumber:profile.orgShortName || profile.posMasterNo?
|
||||
Extension.ToThaiNumber(profile.orgShortName) +
|
||||
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()),
|
||||
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : null,
|
||||
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()): "-",
|
||||
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
|
||||
positionSalaryAmount: profile.positionSalaryAmount
|
||||
? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
|
||||
: null,
|
||||
score: profile.result,
|
||||
: "-",
|
||||
score: profile.result?Extension.ToThaiNumber(profile.result):"-",
|
||||
reason: profile.remark,
|
||||
};
|
||||
});
|
||||
|
|
@ -4682,25 +4682,13 @@ export class ReportController extends Controller {
|
|||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
|
||||
const positionParts = [
|
||||
profile.position,
|
||||
profile.child4,
|
||||
profile.child3,
|
||||
profile.child2,
|
||||
profile.child1,
|
||||
profile.root,
|
||||
];
|
||||
|
||||
const position = positionParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
no: Extension.ToThaiNumber((index + 1).toLocaleString()),
|
||||
fullName: fullName,
|
||||
affiliation: affiliation,
|
||||
position: position,
|
||||
position: profile.position ?? "-",
|
||||
posLevel: profile.posLevel?Extension.ToThaiNumber(profile.posLevel.toLocaleString()) : "-",
|
||||
posNumber:profile.orgShortName || profile.posMasterNo ?
|
||||
Extension.ToThaiNumber(profile.orgShortName) +
|
||||
|
|
@ -4709,7 +4697,7 @@ export class ReportController extends Controller {
|
|||
positionSalaryAmount: profile.positionSalaryAmount
|
||||
? Extension.ToThaiNumber(profile.positionSalaryAmount.toLocaleString())
|
||||
: "-",
|
||||
score: profile.result??"-",
|
||||
score: profile.result?Extension.ToThaiNumber(profile.result):"-",
|
||||
reason: profile.remark,
|
||||
remark: null,
|
||||
};
|
||||
|
|
@ -4794,7 +4782,7 @@ export class ReportController extends Controller {
|
|||
Extension.ToThaiNumber(profile.posMasterNo.toLocaleString()):"-",
|
||||
amount: profile.amount ? Extension.ToThaiNumber(profile.amount.toLocaleString()) : "-",
|
||||
reason: null,
|
||||
score: profile.result??"-",
|
||||
score: profile.result?Extension.ToThaiNumber(profile.result):"-",
|
||||
signature: profile.remark,
|
||||
};
|
||||
});
|
||||
|
|
@ -5167,7 +5155,7 @@ export class ReportController extends Controller {
|
|||
reason1: null, //เหตุผลที่ไม่ได้เลื่อนขั้น
|
||||
reason2: null, //เหตุผลที่ไม่ได้เลื่อนขั้น
|
||||
reason3: null, //เหตุผลที่ไม่ได้เลื่อนขั้น
|
||||
score: profile.result,
|
||||
score: profile.result?Extension.ToThaiNumber(profile.result):"-",
|
||||
reason: profile.remark,
|
||||
};
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue