upd
This commit is contained in:
@ -15,12 +15,12 @@ class BastAdapter extends Adapter {
|
|||||||
let offset = req.query.offset;
|
let offset = req.query.offset;
|
||||||
let keyword = req.query.keyword;
|
let keyword = req.query.keyword;
|
||||||
|
|
||||||
let qry = "select * from vw_bastactivitylist ";
|
let qry = "select v.*, COALESCE(c.currency, 'USD') AS currency_code, COALESCE(c.symbol, '$') AS currency_symbol, pr.rate_snapshot AS pr_rate_snapshot " +
|
||||||
qry = qry + "where activityname like '%" + keyword + "%' ";
|
"from vw_bastactivitylist v " +
|
||||||
qry = qry + "order by idxbudget asc limit " + offset + ", " + limit;
|
"left join tbl_pr pr on pr._idx = v.idxpr " +
|
||||||
// let qry = "select * from vw_basthandoverlist ";
|
"left join tbl_currency c on c._idx = pr.currency_id ";
|
||||||
// qry = qry + "where bastnumber like '%" + keyword + "%' ";
|
qry = qry + "where v.activityname like '%" + keyword + "%' ";
|
||||||
// qry = qry + "order by _idx asc limit " + offset + ", " + limit;
|
qry = qry + "order by v.idxbudget asc limit " + offset + ", " + limit;
|
||||||
|
|
||||||
// console.log(qry);
|
// console.log(qry);
|
||||||
db.query(qry, [], function (err, result, fields) {
|
db.query(qry, [], function (err, result, fields) {
|
||||||
@ -40,9 +40,12 @@ class BastAdapter extends Adapter {
|
|||||||
"totalpage": pagination,
|
"totalpage": pagination,
|
||||||
"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, pr.rate_snapshot AS pr_rate_snapshot " +
|
||||||
qry = qry + "where activityname like '%" + keyword + "%' ";
|
"from vw_bastactivitylist v " +
|
||||||
qry = qry + "order by idxbudget asc limit " + offset + ", " + limit;
|
"left join tbl_pr pr on pr._idx = v.idxpr " +
|
||||||
|
"left join tbl_currency c on c._idx = pr.currency_id ";
|
||||||
|
qry = qry + "where v.activityname like '%" + keyword + "%' ";
|
||||||
|
qry = qry + "order by v.idxbudget asc limit " + offset + ", " + limit;
|
||||||
// qry = "select * from vw_basthandoverlist ";
|
// qry = "select * from vw_basthandoverlist ";
|
||||||
// qry = qry + "where bastnumber like '%" + keyword + "%' ";
|
// qry = qry + "where bastnumber like '%" + keyword + "%' ";
|
||||||
// qry = qry + "order by _idx asc limit " + offset + ", " + limit;
|
// qry = qry + "order by _idx asc limit " + offset + ", " + limit;
|
||||||
@ -142,8 +145,15 @@ class BastAdapter extends Adapter {
|
|||||||
try {
|
try {
|
||||||
let idxpr = req.query.idxpr;
|
let idxpr = req.query.idxpr;
|
||||||
|
|
||||||
let qry = "select * from vw_bastactivitylistdetail ";
|
let qry = "select v.*, po.rate_snapshot AS po_rate_snapshot, " +
|
||||||
qry = qry + "where idxpr='" + idxpr + "'";
|
"COALESCE(c.currency, 'USD') AS currency_code, COALESCE(c.symbol, '$') AS currency_symbol, " +
|
||||||
|
"rb.amount AS request_budget_amount " +
|
||||||
|
"from vw_bastactivitylistdetail v " +
|
||||||
|
"left join tbl_po po on po._idx = v.idxpo " +
|
||||||
|
"left join tbl_currency c on c._idx = po.currency_id " +
|
||||||
|
"left join tbl_justification j on j._idx = po.idxjustification " +
|
||||||
|
"left join tbl_requestbudget rb on rb._idx = j.idxrequestbudget " +
|
||||||
|
"where v.idxpr='" + idxpr + "'";
|
||||||
|
|
||||||
// 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