From f4fd33c59ab0f91829ebf5b2730c4fc8e58f73b6 Mon Sep 17 00:00:00 2001 From: x2Skyz Date: Mon, 17 Nov 2025 15:21:33 +0700 Subject: [PATCH] =?UTF-8?q?-=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A=20column?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/controllers/budgetSearchController.js | 12 +++++++++--- .../src/services/budgetSearchService.js | 16 +++++++++------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/exthernal-ttc-api/src/controllers/budgetSearchController.js b/exthernal-ttc-api/src/controllers/budgetSearchController.js index fc96121..1198d93 100644 --- a/exthernal-ttc-api/src/controllers/budgetSearchController.js +++ b/exthernal-ttc-api/src/controllers/budgetSearchController.js @@ -25,14 +25,20 @@ export class budgetSearch { try { // let username = req.body.request.username; // let password = req.body.request.password; - let token = req.body.request.token; + let token = req.headers.authorization?.split(' ')[1]; const decoded = verifyToken(token); let id = decoded.id let username = decoded.name database = decoded.organization - - aryResult = await this.budgetSearchService.getBudgetSearch(database, id); // เช็คกับ db กลาง ส่ง jwttoken ออกมา + let columnParams = req.query.collumn + var column = "" + if(columnParams == 'edit'){ + column = `bdgseq, bdgnam, bdgcod, bdgttl` + } else if(columnParams == 'result' || columnParams == undefined || columnParams == ''){ + column = `bdgnam, bdgttl` + } + aryResult = await this.budgetSearchService.getBudgetSearch(database, id, column); // เช็คกับ db กลาง ส่ง jwttoken ออกมา // this.generalService.devhint(1, 'budgetSearch.js', 'Login success'); } catch (error) { idx = 1; diff --git a/exthernal-ttc-api/src/services/budgetSearchService.js b/exthernal-ttc-api/src/services/budgetSearchService.js index 2e222fe..aec7771 100644 --- a/exthernal-ttc-api/src/services/budgetSearchService.js +++ b/exthernal-ttc-api/src/services/budgetSearchService.js @@ -6,18 +6,20 @@ export class BudgetSearchService { this.generalService = new GeneralService() } - async getBudgetSearch(database, id) { + async getBudgetSearch(database, id, column) { const sql = ` SELECT - bdgseq, - bdgnam, - bdgcod, - bdgttl, - bdgedtdtm + ${column} FROM ${database}.bdgmst ` const params = [] const result = await this.generalService.executeQueryParam(database, sql, params); return result } -} \ No newline at end of file +} + +// bdgseq, +// bdgnam, +// bdgcod, +// bdgttl, +// bdgedtdtm \ No newline at end of file