Commit bbb9e050 by 赵庆

gsb

parent e11be24d
......@@ -49,7 +49,7 @@ class MerchantService extends ServiceBase {
this.addWhereTime(where, 'begin_time', params.signBegin, params.signEnd, true);
var addMer = await this.findCount({where:where});//商户新增
var addMer = await this.findCount({where: where});//商户新增
var upMer = await this.findCount(wheres);//累积
var where_ele = {};
if (params.sign_body) {
......@@ -57,7 +57,7 @@ class MerchantService extends ServiceBase {
}
this.addWhereTime(where_ele, 'completed_date', params.signBegin, params.signEnd, true);
var addEle = await this.electroniccontractDao.findCount({where:where_ele});//电子签新增
var addEle = await this.electroniccontractDao.findCount({where: where_ele});//电子签新增
var upEle = await this.electroniccontractDao.findCount(wheres);//累积
......@@ -67,7 +67,7 @@ class MerchantService extends ServiceBase {
}
this.addWhereTime(where_loa, 'affirm_time', params.signBegin, params.signEnd, true);
var addLoad = await this.loadDao.findCount({where:where_loa});//工作量新增
var addLoad = await this.loadDao.findCount({where: where_loa});//工作量新增
var upLoad = await this.loadDao.findCount(wheres);//
......@@ -77,7 +77,7 @@ class MerchantService extends ServiceBase {
}
this.addWhereTime(where_rec, 'publish_date', params.signBegin, params.signEnd, true);
var addrec = await this.recruitDao.findCount({where:where_rec});//招聘需求
var addrec = await this.recruitDao.findCount({where: where_rec});//招聘需求
var upRec = await this.recruitDao.findCount(wheres);
var where_tax = {};
......@@ -86,10 +86,10 @@ class MerchantService extends ServiceBase {
}
this.addWhereTime(where_tax, 'tax_time', params.signBegin, params.signEnd, true);
var addTac = await this.taxinfoDao.findCount({where:where_tax});//完税人次
var addTac = await this.taxinfoDao.findCount({where: where_tax});//完税人次
var upTac = await this.taxinfoDao.findCount(wheres);
var addTacSum = await this.taxinfoDao.findSum("income_tax", {where:where_tax});//完税金额
var addTacSum = await this.taxinfoDao.findSum("income_tax", {where: where_tax});//完税金额
var upTacSum = await this.taxinfoDao.findSum("income_tax", wheres);
var where_tra = {};
......@@ -97,36 +97,32 @@ class MerchantService extends ServiceBase {
where_tra.sign_body = params.sign_body;
}
this.addWhereTime(where_tra, 'transaction_time', params.signBegin, params.signEnd, true);
var addTra = await this.transactioninDao.findCount({where:where_tra});//交易比数
var addTra = await this.transactioninDao.findCount({where: where_tra});//交易比数
var upTra = await this.transactioninDao.findCount(wheres);
var addTraSum = await this.transactioninDao.findSum("actual_amount", {where:where_tra});//交易金额
var addTraSum = await this.transactioninDao.findSum("actual_amount", {where: where_tra});//交易金额
var upTraSum = await this.transactioninDao.findSum("actual_amount", wheres);
var result = {
addMer: addMer || 0,
addMer: addMer || 0,//商户新增
upMer: upMer || 0,
addEle: addEle || 0,
addEle: addEle || 0,//电子签新增
upEle: upEle || 0,
addLoad: addLoad || 0,
addLoad: addLoad || 0,//工作量新增
upLoad: upLoad || 0,
addrec: addrec || 0,
addrec: addrec || 0,//招聘需求
upRec: upRec || 0,
addTac: addTac || 0,
addTac: addTac || 0,//完税人次
addTacSum: addTacSum || 0,
upTacSum: upTacSum || 0,
upTacSum: upTacSum || 0,//完税金额
addTra: addTra || 0,
upTra: upTra || 0,
upTra: upTra || 0, //交易比数
addTraSum: addTraSum || 0,
upTraSum: upTraSum || 0,
upTraSum: upTraSum || 0,//交易金额
upTac: upTac || 0
};
return result;
}
}
......
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