From f703d8e9b2b67e2f776419ed24ac74d2e38c4dc9 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Tue, 11 Feb 2025 19:45:59 +0700
Subject: [PATCH] fix

---
 src/controllers/ReportController.ts | 31 ++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index ea7f5d0..536c623 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -1111,6 +1111,7 @@ export class ReportController extends Controller {
           isActive: true,
         },
       });
+      // console.log(">>>>1",salaryPeriodIncrease1_APR);
 
       let salaryOrg1_APR = null;
       if (salaryPeriodIncrease1_APR) {
@@ -1124,6 +1125,7 @@ export class ReportController extends Controller {
           },
         });
       }
+      // console.log(">>>>2",salaryOrg1_APR);
 
       let salaryOrg1_OCT = null;
       if (salaryPeriodIncrease1_OCT) {
@@ -1144,6 +1146,8 @@ export class ReportController extends Controller {
           type: Not(In(["NONE", "PENDING"])),
         },
       });
+      // console.log(">>>>3",salaryProfile1);
+      
       //รอบปีก่อนหน้า
       const salaryPeriodIncrease2_APR = await this.salaryPeriodRepository.findOne({
         where: {
@@ -1159,7 +1163,7 @@ export class ReportController extends Controller {
           isActive: true,
         },
       });
-
+      // console.log(">>>>3",salaryPeriodIncrease2_APR);
       let salaryOrg2_APR = null;
       if (salaryPeriodIncrease2_APR) {
         salaryOrg2_APR = await this.salaryOrgRepository.findOne({
@@ -2485,6 +2489,31 @@ export class ReportController extends Controller {
     });
   }
 
+  /**
+   * API เงินเดือน แบบบัญชีถือจ่าย (จ.๑๘) ของข้าราชการกรุงเทพมหานครสามัญ
+   *
+   * @summary เงินเดือน แบบบัญชีถือจ่าย (จ.๑๘) ของข้าราชการกรุงเทพมหานครสามัญ
+   *
+   * @param {string} rootId  Guid, *Id Root
+   * @param {string} salaryPeriodId  Guid, *Id Period
+   */
+  @Get("gov-10/{rootId}/{salaryPeriodId}/{group}")
+  async SalaryReport10(
+    @Path() rootId: string,
+    @Path() salaryPeriodId: string,
+    @Path() group: string,
+  ) {
+
+
+    return new HttpSuccess({
+      template: "gov2-10",
+      reportName: "gov2-10",
+      data: {
+       
+      },
+    });
+  }
+
   /**
    * API 01-บัญชีคำนวณโควตา
    *