From db3afdd7c3e56fac1ad2a4c758e61c6a08c1243c Mon Sep 17 00:00:00 2001 From: Rizki Date: Tue, 24 Mar 2026 22:02:40 +0700 Subject: [PATCH] upd --- adapter/bastadapter.js | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/adapter/bastadapter.js b/adapter/bastadapter.js index 0df048b..8052c2c 100644 --- a/adapter/bastadapter.js +++ b/adapter/bastadapter.js @@ -85,9 +85,12 @@ class BastAdapter extends Adapter { // let qry = "select * from vw_bastactivitylist "; // qry = qry + "where activityname like '%" + keyword + "%' "; // qry = qry + "order by idxbudget asc limit " + offset + ", " + limit; - let qry = "select * from vw_basthandoverlist "; - qry = qry + "where bastnumber like '%" + keyword + "%' "; - qry = qry + "order by _idx asc"; + let qry = "select v.*, COALESCE(c.currency, 'USD') AS currency_code, COALESCE(c.symbol, '$') AS currency_symbol, po.rate_snapshot " + + "from vw_basthandoverlist v " + + "left join tbl_po po on po._idx = v.idxpo " + + "left join tbl_currency c on c._idx = po.currency_id "; + qry = qry + "where v.bastnumber like '%" + keyword + "%' "; + qry = qry + "order by v._idx asc"; // console.log(qry); db.query(qry, [], function (err, result, fields) { @@ -108,12 +111,12 @@ class BastAdapter extends Adapter { "totalrows": result.length, }); - // qry = "select * from vw_bastactivitylist "; - // qry = qry + "where activityname like '%" + keyword + "%' "; - // qry = qry + "order by idxbudget asc limit " + offset + ", " + limit; - qry = "select * from vw_basthandoverlist "; - qry = qry + "where bastnumber like '%" + keyword + "%' "; - qry = qry + "order by _idx asc limit " + offset + ", " + limit; + qry = "select v.*, COALESCE(c.currency, 'USD') AS currency_code, COALESCE(c.symbol, '$') AS currency_symbol, po.rate_snapshot " + + "from vw_basthandoverlist v " + + "left join tbl_po po on po._idx = v.idxpo " + + "left join tbl_currency c on c._idx = po.currency_id "; + qry = qry + "where v.bastnumber like '%" + keyword + "%' "; + qry = qry + "order by v._idx asc limit " + offset + ", " + limit; db.query(qry, [], function (err, result, fields) { if (err) { apires.meta["message"] = err.toString(); @@ -411,8 +414,11 @@ class BastAdapter extends Adapter { try { let idxbast = req.query.idxbast; - let qry = "select * from vw_bast "; - qry = qry + "where _idx='" + idxbast + "'"; + let qry = "select v.*, COALESCE(c.currency, 'USD') AS currency_code, COALESCE(c.symbol, '$') AS currency_symbol, po.rate_snapshot " + + "from vw_bast v " + + "left join tbl_po po on po._idx = v.idxpo " + + "left join tbl_currency c on c._idx = po.currency_id " + + "where v._idx='" + idxbast + "'"; // console.log(qry); db.query(qry, [], function (err, result, fields) {