Skip to content

Z
zhichan
Commit f862b48d by 赵庆
Options

gsb

parent 1d5afa98
Showing with 76 additions and 38 deletions
bpo-stat/app/base/controller/impl/all/merchantCtl.js
...@@ -42,7 +42,7 @@ class MerchantCtl extends CtlBase { ...@@ -42,7 +42,7 @@ class MerchantCtl extends CtlBase {
} }
} }
//统计商户报表 //统计商户报表
async commercialCount(){ async commercialCount(qobj){
var params = qobj || {}; var params = qobj || {};
try { try {
var page = await this.service.commercialCount(params); var page = await this.service.commercialCount(params);
...@@ -52,8 +52,8 @@ class MerchantCtl extends CtlBase { ...@@ -52,8 +52,8 @@ class MerchantCtl extends CtlBase {
return system.getErrResult2("您的网络不稳, 请稍后重试"); return system.getErrResult2("您的网络不稳, 请稍后重试");
} }
} }
//统计商户报表 详情
async commercialList(){ async commercialList(qobj){
var params = qobj || {}; var params = qobj || {};
try { try {
var page = await this.service.commercialList(params); var page = await this.service.commercialList(params);
......
bpo-stat/app/base/service/impl/all/merchantSve.js
...@@ -10,6 +10,12 @@ class MerchantService extends ServiceBase { ...@@ -10,6 +10,12 @@ class MerchantService extends ServiceBase {
this.recruitDao = system.getObject("db.all.recruitDao"); this.recruitDao = system.getObject("db.all.recruitDao");
this.taxinfoDao = system.getObject("db.all.taxinfoDao"); this.taxinfoDao = system.getObject("db.all.taxinfoDao");
this.transactioninDao = system.getObject("db.all.transactioninDao"); this.transactioninDao = system.getObject("db.all.transactioninDao");
this.recruitSve = system.getObject("service.all.recruitSve");
this.electroniccontractSve = system.getObject("service.all.electroniccontractSve");
this.loadSve = system.getObject("service.all.loadSve");
this.taxinfoSve = system.getObject("service.all.taxinfoSve");
this.transactioninSve = system.getObject("service.all.transactioninSve");
} }
async signPage(params) { async signPage(params) {
...@@ -180,18 +186,50 @@ class MerchantService extends ServiceBase { ...@@ -180,18 +186,50 @@ class MerchantService extends ServiceBase {
} }
async commercialList(params){ async commercialList(params){
var result = []; var db = "";
var currentPage = Number(params.currentPage || 1); var firlt = "";
var pageSize = Number(params.pageSize || 10); var page = {};
var sql = ""; if(params.type == 1){ //招工
db = "recruit_info";
firlt = "publish_date"
page = await this.recruitSve.signPage(params);
}else if(params.type == 2){//电子签约
db = "electronic_contract_info";
firlt = "completed_date";
page = await this.electroniccontractSve.signPage(params);
}else if(params.type == 3){//工作量
db = "load_info";
firlt = "affirm_time";
page = await this.loadSve.signPage(params);
}else if(params.type == 4){//交易
db = "transaction_info";
firlt = "transaction_time";
page = await this.transactioninSve.signPage(params);
}else {//完税
db = "tax_info";
firlt = "tax_time";
page = await this.taxinfoSve.signPage(params);
}
var sql = "SELECT DATE_FORMAT("+firlt+",'%Y-%m-%d') days,COUNT(id) COUNT FROM "+db+" WHERE 1=1";
if (params.company_name) { if (params.company_name) {
sql = sql + " ANN company_name = " + params.company_name; sql = sql + " ANN company_name = " + params.company_name;
} }
if (params.sign_body) { if (params.sign_body) {
sql = sql + " AND sign_body = " + params.sign_body; sql = sql + " AND sign_body = " + params.sign_body;
} }
var charts = [[],[]];
var chart = await this.customQuery(sql);
for(let i=0;i< chart.length;i++){
charts[0].push(chart[i].days)
charts[1].push(chart[i].COUNT)
}
page.charts = charts;
return page;
} }
......
bpo-stat/app/config/routes/web.js
...@@ -5,37 +5,37 @@ var userCtl = system.getObject("web.auth.userCtl"); ...@@ -5,37 +5,37 @@ var userCtl = system.getObject("web.auth.userCtl");
const redisClient = system.getObject("util.redisClient"); const redisClient = system.getObject("util.redisClient");
module.exports = function (app) { module.exports = function (app) {
app.all("/web/*", async function (req, res, next) { // app.all("/web/*", async function (req, res, next) {
let bpostatsid = req.headers["bpostatsid"] || ""; // let bpostatsid = req.headers["bpostatsid"] || "";
jsonUser = await redisClient.get(bpostatsid); // jsonUser = await redisClient.get(bpostatsid);
if (jsonUser) { // if (jsonUser) {
jsonUser = JSON.parse(jsonUser); // jsonUser = JSON.parse(jsonUser);
} // }
//
if (req.url.indexOf("auth/userCtl/login") > 0 || // if (req.url.indexOf("auth/userCtl/login") > 0 ||
req.url.indexOf("auth/userCtl/register") > 0 || // req.url.indexOf("auth/userCtl/register") > 0 ||
req.url.indexOf("getRsConfig") > 0) { // req.url.indexOf("getRsConfig") > 0) {
//
if (jsonUser) { // if (jsonUser) {
req.loginUser = jsonUser; // req.loginUser = jsonUser;
} else { // } else {
req.loginUser = null; // req.loginUser = null;
} // }
return next(); // return next();
} // }
//
if (!jsonUser) { // if (!jsonUser) {
res.end(JSON.stringify({status: -99, msg: "no login"})); // res.end(JSON.stringify({status: -99, msg: "no login"}));
return; // return;
} // }
//
if (bpostatsid) { // if (bpostatsid) {
redisClient.setWithEx(bpostatsid, JSON.stringify(jsonUser), 60 * 60 * 60); // redisClient.setWithEx(bpostatsid, JSON.stringify(jsonUser), 60 * 60 * 60);
} // }
//
req.loginUser = jsonUser; // req.loginUser = jsonUser;
next(); // next();
}); // });
app.get("/", async function (req, res) { app.get("/", async function (req, res) {
res.render("index", {appinfo: null, app: null}); res.render("index", {appinfo: null, app: null});
......
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