From 4cf4ec0f78ee941676e12ddab680263d24e1f1ef Mon Sep 17 00:00:00 2001
From: "DESKTOP-2S5P7D1\\Windows 10" <kittapath@frappet.com>
Date: Fri, 10 Jan 2025 16:03:23 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B6?=
 =?UTF-8?q?=E0=B8=81=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95?=
 =?UTF-8?q?=E0=B8=B4=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94?=
 =?UTF-8?q?=E0=B8=B7=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/ReportController.ts | 71 ++++++++++++++---------------
 1 file changed, 33 insertions(+), 38 deletions(-)

diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index 8a8dd2b..14d9877 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -1056,9 +1056,12 @@ export class ReportController extends Controller {
 				commandYear: number
 				templateDoc: string | null
 				amount: Double | null
-				amountSpecial?: Double | null;
+				amountSpecial?: Double | null
 				positionSalaryAmount: Double | null
 				mouthSalaryAmount: Double | null
+				mpCee?: string | null
+				refCommandCode?: string | null
+				refCommandName?: string | null
 			}[]
 		}
 	) {
@@ -1073,6 +1076,8 @@ export class ReportController extends Controller {
 					amount: v.amount,
 					positionSalaryAmount: v.positionSalaryAmount,
 					mouthSalaryAmount: v.mouthSalaryAmount,
+					refCommandCode: v.refCommandCode,
+					refCommandName: v.refCommandName,
 				})),
 			})
 			.then(async res => {
@@ -1143,9 +1148,12 @@ export class ReportController extends Controller {
 				commandYear: number
 				templateDoc: string | null
 				amount: Double | null
-				amountSpecial?: Double | null;
+				amountSpecial?: Double | null
 				positionSalaryAmount: Double | null
 				mouthSalaryAmount: Double | null
+				mpCee?: string | null
+				refCommandCode?: string | null
+				refCommandName?: string | null
 			}[]
 		}
 	) {
@@ -1161,6 +1169,8 @@ export class ReportController extends Controller {
 					positionSalaryAmount: v.positionSalaryAmount,
 					mouthSalaryAmount: v.mouthSalaryAmount,
 					isGovernment: false,
+					refCommandCode: v.refCommandCode,
+					refCommandName: v.refCommandName,
 				})),
 			})
 			.then(async res => {
@@ -1232,6 +1242,9 @@ export class ReportController extends Controller {
 				amountSpecial?: Double | null
 				positionSalaryAmount: Double | null
 				mouthSalaryAmount: Double | null
+				mpCee?: string | null
+				refCommandCode?: string | null
+				refCommandName?: string | null
 			}[]
 		}
 	) {
@@ -1308,47 +1321,29 @@ export class ReportController extends Controller {
 	}
 
 	@Get("report1")
-	public async report1(@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: "",
-	  });
+	public async report1(@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("report2")
-	public async report2(@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: "",
-	  });
+	public async report2(@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("report3")
-	public async report3(@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: "",
-	  });
+	public async report3(@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: "",
+		})
 	}
 }