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

checkpoint

Browse source
This commit is contained in:
AdisakKanthawilang 2025-04-17 11:56:54 +07:00
parent da710215ec
commit 5abaacdf15
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/controllers/ReportController.ts
View file

@ -334,6 +334,8 @@ export class ReoportController {
prefix: evaluation.prefix, prefix: evaluation.prefix,
fullName: evaluation.fullName ? `${evaluation.fullName}` : "", fullName: evaluation.fullName ? `${evaluation.fullName}` : "",
position: evaluation.position ? evaluation.position : "", position: evaluation.position ? evaluation.position : "",
posAndPosLevel: (evaluation.position ? `${evaluation.position}` : "") + (evaluation.positionLevel ? `${evaluation.positionLevel}` : ""),
posAndTypeTh: (evaluation.position ? `${evaluation.position}` : "" ) + (typeTh ? `${typeTh}` : ""),
posNo: evaluation.posNo ? Extension.ToThaiNumber(evaluation.posNo) : "", posNo: evaluation.posNo ? Extension.ToThaiNumber(evaluation.posNo) : "",
posNoWithSym: evaluation.posNo ? `(${Extension.ToThaiNumber(evaluation.posNo)})` : "", posNoWithSym: evaluation.posNo ? `(${Extension.ToThaiNumber(evaluation.posNo)})` : "",
oc: evaluation.oc ? evaluation.oc : "-", oc: evaluation.oc ? evaluation.oc : "-",
@ -341,11 +343,12 @@ export class ReoportController {
orgNoNewLine: _orgNoNewLine ? _orgNoNewLine : "-", //สังกัดแบบไม่เว้นวรรค orgNoNewLine: _orgNoNewLine ? _orgNoNewLine : "-", //สังกัดแบบไม่เว้นวรรค
root: root ? root : "-", //หน่วยงาน root: root ? root : "-", //หน่วยงาน
salary: evaluation.salary ? Extension.ToThaiNumber(evaluation.salary) : "-", salary: evaluation.salary ? Extension.ToThaiNumber(evaluation.salary) : "-",
salaryWithPrefix: evaluation.salary ? "อัตราเงินเดือนปัจจุบัน" +" "+ Extension.ToThaiNumber(evaluation.salary) : "-",
positionLevel: evaluation.positionLevel ? evaluation.positionLevel : "", positionLevel: evaluation.positionLevel ? evaluation.positionLevel : "",
birthDate: birthDate:
evaluation.birthDate != null && evaluation.birthDate != "" evaluation.birthDate != null && evaluation.birthDate != ""
? Extension.ToThaiNumber( ? Extension.ToThaiNumber(
Extension.ToThaiShortDate_noPrefix(new Date(evaluation.birthDate)), Extension.ToThaiFullDate2(new Date(evaluation.birthDate)),
) )
: "-", : "-",
govAge: evaluation.govAge != null ? Extension.ToThaiNumber(evaluation.govAge) : "-", govAge: evaluation.govAge != null ? Extension.ToThaiNumber(evaluation.govAge) : "-",