diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 452a4d0..c687c2a 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -334,6 +334,8 @@ export class ReoportController { prefix: evaluation.prefix, fullName: evaluation.fullName ? `${evaluation.fullName}` : "", 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) : "", posNoWithSym: evaluation.posNo ? `(${Extension.ToThaiNumber(evaluation.posNo)})` : "", oc: evaluation.oc ? evaluation.oc : "-", @@ -341,11 +343,12 @@ export class ReoportController { orgNoNewLine: _orgNoNewLine ? _orgNoNewLine : "-", //สังกัดแบบไม่เว้นวรรค root: root ? root : "-", //หน่วยงาน salary: evaluation.salary ? Extension.ToThaiNumber(evaluation.salary) : "-", + salaryWithPrefix: evaluation.salary ? "อัตราเงินเดือนปัจจุบัน" +" "+ Extension.ToThaiNumber(evaluation.salary) : "-", positionLevel: evaluation.positionLevel ? evaluation.positionLevel : "", birthDate: evaluation.birthDate != null && evaluation.birthDate != "" ? Extension.ToThaiNumber( - Extension.ToThaiShortDate_noPrefix(new Date(evaluation.birthDate)), + Extension.ToThaiFullDate2(new Date(evaluation.birthDate)), ) : "-", govAge: evaluation.govAge != null ? Extension.ToThaiNumber(evaluation.govAge) : "-",