upd
This commit is contained in:
@ -85,9 +85,12 @@ class BastAdapter extends Adapter {
|
|||||||
// let qry = "select * from vw_bastactivitylist ";
|
// let qry = "select * from vw_bastactivitylist ";
|
||||||
// qry = qry + "where activityname like '%" + keyword + "%' ";
|
// qry = qry + "where activityname like '%" + keyword + "%' ";
|
||||||
// qry = qry + "order by idxbudget asc limit " + offset + ", " + limit;
|
// qry = qry + "order by idxbudget asc limit " + offset + ", " + limit;
|
||||||
let qry = "select * from vw_basthandoverlist ";
|
let qry = "select v.*, COALESCE(c.currency, 'USD') AS currency_code, COALESCE(c.symbol, '$') AS currency_symbol, po.rate_snapshot " +
|
||||||
qry = qry + "where bastnumber like '%" + keyword + "%' ";
|
"from vw_basthandoverlist v " +
|
||||||
qry = qry + "order by _idx asc";
|
"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);
|
// console.log(qry);
|
||||||
db.query(qry, [], function (err, result, fields) {
|
db.query(qry, [], function (err, result, fields) {
|
||||||
@ -108,12 +111,12 @@ class BastAdapter extends Adapter {
|
|||||||
"totalrows": result.length,
|
"totalrows": result.length,
|
||||||
});
|
});
|
||||||
|
|
||||||
// qry = "select * from vw_bastactivitylist ";
|
qry = "select v.*, COALESCE(c.currency, 'USD') AS currency_code, COALESCE(c.symbol, '$') AS currency_symbol, po.rate_snapshot " +
|
||||||
// qry = qry + "where activityname like '%" + keyword + "%' ";
|
"from vw_basthandoverlist v " +
|
||||||
// qry = qry + "order by idxbudget asc limit " + offset + ", " + limit;
|
"left join tbl_po po on po._idx = v.idxpo " +
|
||||||
qry = "select * from vw_basthandoverlist ";
|
"left join tbl_currency c on c._idx = po.currency_id ";
|
||||||
qry = qry + "where bastnumber like '%" + keyword + "%' ";
|
qry = qry + "where v.bastnumber like '%" + keyword + "%' ";
|
||||||
qry = qry + "order by _idx asc limit " + offset + ", " + limit;
|
qry = qry + "order by v._idx asc limit " + offset + ", " + limit;
|
||||||
db.query(qry, [], function (err, result, fields) {
|
db.query(qry, [], function (err, result, fields) {
|
||||||
if (err) {
|
if (err) {
|
||||||
apires.meta["message"] = err.toString();
|
apires.meta["message"] = err.toString();
|
||||||
@ -411,8 +414,11 @@ class BastAdapter extends Adapter {
|
|||||||
try {
|
try {
|
||||||
let idxbast = req.query.idxbast;
|
let idxbast = req.query.idxbast;
|
||||||
|
|
||||||
let qry = "select * from vw_bast ";
|
let qry = "select v.*, COALESCE(c.currency, 'USD') AS currency_code, COALESCE(c.symbol, '$') AS currency_symbol, po.rate_snapshot " +
|
||||||
qry = qry + "where _idx='" + idxbast + "'";
|
"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);
|
// console.log(qry);
|
||||||
db.query(qry, [], function (err, result, fields) {
|
db.query(qry, [], function (err, result, fields) {
|
||||||
|
|||||||
Reference in New Issue
Block a user