update history log
This commit is contained in:
parent
6e8f026770
commit
1b8c101429
10
index.js
10
index.js
@ -157,9 +157,9 @@ server.get('/list_changes', bodyParser.json(), function (req, res) {
|
||||
console.log(new Date().toISOString() + "-------------------------list changes:------------------------------")
|
||||
console.log(req.body);
|
||||
//parse the where clause into the main sql statement
|
||||
sql = sql.replace(new RegExp("replace_user",'g'),JSON.stringify(req.body))
|
||||
sql = sql.replace(new RegExp("replace_user", 'g'), JSON.stringify(req.body.quota_rep_descr))
|
||||
//execute the sql and send the result
|
||||
//console.log(sql);
|
||||
console.log(sql);
|
||||
Postgres.FirstRow(sql, [], res)
|
||||
};
|
||||
})
|
||||
@ -480,13 +480,11 @@ function build_where(req, c, w, d, args) {
|
||||
d = d + 1;
|
||||
}
|
||||
w = w + ")";
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
w = w + i + " = '" + req.body.scenario[i] + "'";
|
||||
}
|
||||
args.push(req.body.scenario[i]);
|
||||
c = c + 1;
|
||||
}
|
||||
;
|
||||
};
|
||||
return { c, w, d };
|
||||
}
|
@ -1,21 +1,37 @@
|
||||
WITH
|
||||
list AS (
|
||||
list AS materialized (
|
||||
SELECT
|
||||
iterdef->>'user' "user",
|
||||
iterdef->>'stamp' "stamp",
|
||||
iterdef->>'mesasage' "comment",
|
||||
round(SUM(fb_val_loc * r_rate)::numeric,2) sales,
|
||||
jsonb_pretty(iterdef) def
|
||||
l.doc->>'user' "user",
|
||||
jsonb_path_query_first(l.doc,'$.scenario.quota_rep_descr')->>0 quota_rep_descr,
|
||||
to_char((l.doc->>'stamp')::timestamptz,'YYYY-MM-DD HH:MI:SS') "stamp",
|
||||
l.doc->>'message' "comment",
|
||||
jsonb_pretty(l.doc) def,
|
||||
l.id
|
||||
FROM
|
||||
rlarp.osm_fcpool
|
||||
rlarp.osm_log l
|
||||
WHERE
|
||||
iterdef IS NOT NULL
|
||||
AND iterdef @> $$replace_user$$::jsonb
|
||||
GROUP BY
|
||||
iterdef->>'user',
|
||||
iterdef->>'stamp',
|
||||
iterdef->>'message',
|
||||
iterdef
|
||||
l.doc @? '$.scenario.quota_rep_descr ? (@ == replace_user)'
|
||||
)
|
||||
,agg as (
|
||||
SELECT
|
||||
list.user
|
||||
,list.quota_rep_descr
|
||||
,list.stamp
|
||||
,list.comment
|
||||
,list.def
|
||||
,list.id
|
||||
,to_char(round(sum(value_usd),2),'$999,999,999D00') sales
|
||||
from
|
||||
LIST
|
||||
inner join rlarp.osm_pool on
|
||||
id = logid
|
||||
group BY
|
||||
list.user
|
||||
,list.quota_rep_descr
|
||||
,list.stamp
|
||||
,list.comment
|
||||
,list.def
|
||||
,list.id
|
||||
)
|
||||
SELECT
|
||||
jsonb_agg(row_to_json(list)::jsonb) x from list
|
||||
jsonb_agg(row_to_json(agg)::jsonb ORDER BY agg.stamp desc) x from agg
|
Loading…
Reference in New Issue
Block a user