Commit e2ea4634 by 赵庆

gsb

parent 7593175d
...@@ -7,7 +7,7 @@ class ElectronicContractCtl extends CtlBase { ...@@ -7,7 +7,7 @@ class ElectronicContractCtl extends CtlBase {
} }
async allList(qobj){ async allList(qobj){
var params = qobj.search || {}; var params = qobj || {};
this.doTimeCondition(params, ["signBegin", "signEnd"]); this.doTimeCondition(params, ["signBegin", "signEnd"]);
try { try {
var page = await this.service.signPage(params); var page = await this.service.signPage(params);
......
...@@ -7,7 +7,7 @@ class LoadCtl extends CtlBase { ...@@ -7,7 +7,7 @@ class LoadCtl extends CtlBase {
} }
async allList(qobj){ async allList(qobj){
var params = qobj.search || {}; var params = qobj || {};
this.doTimeCondition(params, ["signBegin", "signEnd"]); this.doTimeCondition(params, ["signBegin", "signEnd"]);
try { try {
var page = await this.service.signPage(params); var page = await this.service.signPage(params);
......
...@@ -7,7 +7,7 @@ class MerchantCtl extends CtlBase { ...@@ -7,7 +7,7 @@ class MerchantCtl extends CtlBase {
} }
async allList(qobj){ async allList(qobj){
var params = qobj.search || {}; var params = qobj || {};
this.doTimeCondition(params, ["signBegin", "signEnd"]); this.doTimeCondition(params, ["signBegin", "signEnd"]);
try { try {
var page = await this.service.signPage(params); var page = await this.service.signPage(params);
...@@ -18,6 +18,21 @@ class MerchantCtl extends CtlBase { ...@@ -18,6 +18,21 @@ class MerchantCtl extends CtlBase {
} }
} }
async dataSummarize(qobj){
var params = qobj || {};
this.doTimeCondition(params, ["signBegin", "signEnd"]);
try {
var page = await this.service.dataSummarize(params);
return system.getResult2(page);
} catch (e) {
console.log(e);
return system.getErrResult2("您的网络不稳, 请稍后重试");
}
}
} }
module.exports = MerchantCtl; module.exports = MerchantCtl;
\ No newline at end of file
...@@ -7,7 +7,7 @@ class RecruitCtl extends CtlBase { ...@@ -7,7 +7,7 @@ class RecruitCtl extends CtlBase {
} }
async allList(qobj){ async allList(qobj){
var params = qobj.search || {}; var params = qobj || {};
this.doTimeCondition(params, ["signBegin", "signEnd"]); this.doTimeCondition(params, ["signBegin", "signEnd"]);
try { try {
var page = await this.service.signPage(params); var page = await this.service.signPage(params);
......
...@@ -7,7 +7,7 @@ class TaxinfoCtl extends CtlBase { ...@@ -7,7 +7,7 @@ class TaxinfoCtl extends CtlBase {
} }
async allList(qobj){ async allList(qobj){
var params = qobj.search || {}; var params = qobj || {};
this.doTimeCondition(params, ["signBegin", "signEnd"]); this.doTimeCondition(params, ["signBegin", "signEnd"]);
try { try {
var page = await this.service.signPage(params); var page = await this.service.signPage(params);
......
...@@ -7,7 +7,7 @@ class TransactioninCtl extends CtlBase { ...@@ -7,7 +7,7 @@ class TransactioninCtl extends CtlBase {
} }
async allList(qobj){ async allList(qobj){
var params = qobj.search || {}; var params = qobj || {};
this.doTimeCondition(params, ["signBegin", "signEnd"]); this.doTimeCondition(params, ["signBegin", "signEnd"]);
try { try {
var page = await this.service.signPage(params); var page = await this.service.signPage(params);
......
...@@ -5,6 +5,11 @@ const settings = require("../../../../config/settings"); ...@@ -5,6 +5,11 @@ const settings = require("../../../../config/settings");
class MerchantService extends ServiceBase { class MerchantService extends ServiceBase {
constructor() { constructor() {
super("all", ServiceBase.getDaoName(MerchantService)); super("all", ServiceBase.getDaoName(MerchantService));
this.electroniccontractDao = system.getObject("db.all.electroniccontractDao");
this.loadDao = system.getObject("db.all.loadDao");
this.recruitDao = system.getObject("db.all.recruitDao");
this.taxinfoDao = system.getObject("db.all.taxinfoDao");
this.transactioninDao = system.getObject("db.all.transactioninDao");
} }
async signPage(params) { async signPage(params) {
...@@ -34,6 +39,96 @@ class MerchantService extends ServiceBase { ...@@ -34,6 +39,96 @@ class MerchantService extends ServiceBase {
return page; return page;
} }
async dataSummarize(params) {
var where = {};
var wheres = {};
if (params.sign_body) {
where.sign_body = params.sign_body;
wheres.sign_body = params.sign_body;
}
this.addWhereTime(where, 'begin_time', params.signBegin, params.signEnd, true);
var addMer = await this.findCount({where:where});//商户新增
var upMer = await this.findCount(wheres);//累积
var where_ele = {};
if (params.sign_body) {
where_ele.sign_body = params.sign_body;
}
this.addWhereTime(where_ele, 'completed_date', params.signBegin, params.signEnd, true);
var addEle = await this.electroniccontractDao.findCount({where:where_ele});//电子签新增
var upEle = await this.electroniccontractDao.findCount(wheres);//累积
var where_loa = {};
if (params.sign_body) {
where_ele.sign_body = params.sign_body;
}
this.addWhereTime(where_loa, 'affirm_time', params.signBegin, params.signEnd, true);
var addLoad = await this.loadDao.findCount({where:where_loa});//工作量新增
var upLoad = await this.loadDao.findCount(wheres);//
var where_rec = {};
if (params.sign_body) {
where_rec.sign_body = params.sign_body;
}
this.addWhereTime(where_rec, 'publish_date', params.signBegin, params.signEnd, true);
var addrec = await this.recruitDao.findCount({where:where_rec});//招聘需求
var upRec = await this.recruitDao.findCount(wheres);
var where_tax = {};
if (params.sign_body) {
where_tax.sign_body = params.sign_body;
}
this.addWhereTime(where_tax, 'tax_time', params.signBegin, params.signEnd, true);
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 upTacSum = await this.taxinfoDao.findSum("income_tax", wheres);
var where_tra = {};
if (params.sign_body) {
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 upTra = await this.transactioninDao.findCount(wheres);
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,
upMer: upMer || 0,
addEle: addEle || 0,
upEle: upEle || 0,
addLoad: addLoad || 0,
upLoad: upLoad || 0,
addrec: addrec || 0,
upRec: upRec || 0,
addTac: addTac || 0,
addTacSum: addTacSum || 0,
upTacSum: upTacSum || 0,
addTra: addTra || 0,
upTra: upTra || 0,
addTraSum: addTraSum || 0,
upTraSum: upTraSum || 0,
upTac: upTac || 0
};
return result;
}
} }
module.exports = MerchantService; module.exports = MerchantService;
\ No newline at end of file
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