From ecf9b144d16793b8c3d4bcc95ce9600d7dfdbfe5 Mon Sep 17 00:00:00 2001 From: Bright Date: Mon, 19 Feb 2024 15:31:07 +0700 Subject: [PATCH] no message --- src/controllers/ReportController.ts | 31 +++++++++++++++-------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index b81cb4c..6d1a702 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -93,20 +93,21 @@ export class ReportController extends Controller { salaryFullHalfSpecial: item.salaryFullHalfSpecial == null || 0 ? "" : item.salaryFullHalfSpecial.toLocaleString(), })); - const mapData = { - nameType: salarys.salaryType == "OFFICER" ? "ผังข้าราชการกรุงเทพมหานครสามัญ" : - salarys.salaryType == "EMPLOYEE" ? "ผังลูกจ้างประจำกรุงเทพมหานคร" : "", - level: posLevel?.posLevelName == null ? "" : posLevel?.posLevelName, - type: posType?.posTypeName == null ? "" : posType?.posTypeName, - date: salarys.date == null ? "" : - salarys.date.getDate() + " " + Extension.ToThaiMonth(salarys.date.getMonth()+1) + " " + Extension.ToThaiYear(salarys.date.getFullYear()), - startDate: salarys.startDate == null ? "" : - salarys.startDate.getDate() + " " + Extension.ToThaiMonth(salarys.startDate.getMonth()+1) + " " + Extension.ToThaiYear(salarys.startDate.getFullYear()), - endDate: salarys.endDate == null ? "" : - salarys.endDate.getDate() + " " + Extension.ToThaiMonth(salarys.endDate.getMonth()+1) + " " + Extension.ToThaiYear(salarys.endDate.getFullYear()), - details: salarys.details == null ? "" : salarys.details, - salaryRanks: mapSalaryRank - } - return new HttpSuccess(mapData); + return new HttpSuccess({ template: "salaryReport", reportName: "salaryReport", + data: { + nameType: salarys.salaryType == "OFFICER" ? "ผังข้าราชการกรุงเทพมหานครสามัญ" : + salarys.salaryType == "EMPLOYEE" ? "ผังลูกจ้างประจำกรุงเทพมหานคร" : "", + level: posLevel?.posLevelName == null ? "" : posLevel?.posLevelName, + type: posType?.posTypeName == null ? "" : posType?.posTypeName, + date: salarys.date == null ? "" : + salarys.date.getDate() + " " + Extension.ToThaiMonth(salarys.date.getMonth()+1) + " " + Extension.ToThaiYear(salarys.date.getFullYear()), + startDate: salarys.startDate == null ? "" : + salarys.startDate.getDate() + " " + Extension.ToThaiMonth(salarys.startDate.getMonth()+1) + " " + Extension.ToThaiYear(salarys.startDate.getFullYear()), + endDate: salarys.endDate == null ? "" : + salarys.endDate.getDate() + " " + Extension.ToThaiMonth(salarys.endDate.getMonth()+1) + " " + Extension.ToThaiYear(salarys.endDate.getFullYear()), + details: salarys.details == null ? "" : salarys.details, + salaryRanks: mapSalaryRank + } + }); } }