From 1ddd4fe1000fb83a2557bd13df498d47892d0f64 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Tue, 24 Dec 2024 12:20:16 +0700 Subject: [PATCH 1/2] =?UTF-8?q?api=20=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87?= =?UTF-8?q?=20report?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ReportController.ts | 45 +++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index b3f45fe..acad415 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -1304,4 +1304,49 @@ export class ReportController extends Controller { ) return new HttpSuccess(directors) } + + @Get("repot1") + public async repot1(@Request() req: RequestWithUser, + @Query("nodeId") nodeId?: string, + @Query("node") node?: string, + @Query("startDate") startDate?: Date, + @Query("endDate") endDate?: Date, + ) { + + return new HttpSuccess({ + template: "placementProbation01", + reportName: "xlsx-report", + data: "", + }); + } + + @Get("repot2") + public async repot2(@Request() req: RequestWithUser, + @Query("nodeId") nodeId?: string, + @Query("node") node?: string, + @Query("startDate") startDate?: Date, + @Query("endDate") endDate?: Date, + ) { + + return new HttpSuccess({ + template: "placementProbation02", + reportName: "xlsx-report", + data: "", + }); + } + + @Get("repot3") + public async repot3(@Request() req: RequestWithUser, + @Query("nodeId") nodeId?: string, + @Query("node") node?: string, + @Query("startDate") startDate?: Date, + @Query("endDate") endDate?: Date, + ) { + + return new HttpSuccess({ + template: "placementProbation03", + reportName: "xlsx-report", + data: "", + }); + } } From 03ddeed71447009f3cc7a136e2d2b576529ceab5 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Tue, 24 Dec 2024 17:30:37 +0700 Subject: [PATCH 2/2] fix report --- src/controllers/ReportController.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index acad415..3d40bbc 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -1056,6 +1056,7 @@ export class ReportController extends Controller { commandYear: number templateDoc: string | null amount: Double | null + amountSpecial?: Double | null; positionSalaryAmount: Double | null mouthSalaryAmount: Double | null }[] @@ -1142,6 +1143,7 @@ export class ReportController extends Controller { commandYear: number templateDoc: string | null amount: Double | null + amountSpecial?: Double | null; positionSalaryAmount: Double | null mouthSalaryAmount: Double | null }[]