Commit 35ccb9a5 by 赵庆

gsb

parent 0ac50d84
......@@ -134,7 +134,7 @@ class MerchantService extends ServiceBase {
async dataChart(params) {
var result = [];
var sql = "SELECT DATE_FORMAT(invalid_time,'%Y-%m-%d') days,COUNT(id) COUNT FROM merchant_info WHERE 1=1";
var sql = "SELECT DATE_FORMAT(completed_date,'%Y-%m-%d') days,COUNT(id) COUNT FROM electronic_contract_info WHERE 1=1";
var sqls = "SELECT DATE_FORMAT(transaction_time,'%Y-%m-%d') days,COUNT(id) COUNT FROM transaction_info WHERE 1=1";
if (params.company_name) {
sql = sql + " AND company_name = '" + params.company_name + "'";
......@@ -145,7 +145,7 @@ class MerchantService extends ServiceBase {
sqls = sqls + " AND sign_body = '" + params.sign_body + "'";
}
if (params.signBegin || params.signEnd) {
sql = sql + " AND invalid_time >= '" + params.signBegin + " 00:00:00' AND invalid_time <= '" + params.signEnd + " 23:59:59'";
sql = sql + " AND completed_date >= '" + params.signBegin + " 00:00:00' AND completed_date <= '" + params.signEnd + " 23:59:59'";
sqls = sqls + " AND transaction_time >= '" + params.signBegin + " 00:00:00' AND transaction_time <= '" + params.signEnd + " 23:59:59'";
}
sql = sql + " GROUP BY days ORDER BY days ASC";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment