Skip to content

Z
zhichan
Commit 965ad768 by 赵庆
Options

gsb

parent 049245d4
Showing with 71 additions and 18 deletions
bpo-stat/app/base/service/impl/all/electroniccontractSve.js
...@@ -20,6 +20,9 @@ class ElectronicContractService extends ServiceBase { ...@@ -20,6 +20,9 @@ class ElectronicContractService extends ServiceBase {
if(params.sign_body){ if(params.sign_body){
where.sign_body = params.sign_body; where.sign_body = params.sign_body;
} }
if(params.id_no){
where.id_no = params.id_no
}
this.addWhereTime(where, 'completed_date', params.signBegin, params.signEnd, true); this.addWhereTime(where, 'completed_date', params.signBegin, params.signEnd, true);
var orderby = [ var orderby = [
["id", 'desc'] ["id", 'desc']
......
bpo-stat/app/base/service/impl/all/loadSve.js
...@@ -20,6 +20,9 @@ class LoadService extends ServiceBase { ...@@ -20,6 +20,9 @@ class LoadService extends ServiceBase {
if(params.sign_body){ if(params.sign_body){
where.sign_body = params.sign_body; where.sign_body = params.sign_body;
} }
if(params.id_no){
where.id_no = params.id_no
}
this.addWhereTime(where, 'begin_time', params.signBegin, params.signEnd, true); this.addWhereTime(where, 'begin_time', params.signBegin, params.signEnd, true);
var orderby = [ var orderby = [
["id", 'desc'] ["id", 'desc']
......
bpo-stat/app/base/service/impl/all/merchantSve.js
...@@ -173,7 +173,7 @@ class MerchantService extends ServiceBase { ...@@ -173,7 +173,7 @@ class MerchantService extends ServiceBase {
return result || []; return result || [];
} }
async commercialCount(params){ async commercialCount(params) {
let page = await this.signPage(params); let page = await this.signPage(params);
...@@ -200,9 +200,9 @@ class MerchantService extends ServiceBase { ...@@ -200,9 +200,9 @@ class MerchantService extends ServiceBase {
let traSUm = await this.transactioninDao.statCounts(companyNames); let traSUm = await this.transactioninDao.statCounts(companyNames);
// 完税人次 // 完税人次
let taxMap = await this.taxinfoDao.statCount(companyNames); let taxMap = await this.taxinfoDao.statCount(companyNames);
// 完税金额 // 完税金额
let taxSUm = await this.taxinfoDao.statCounts(companyNames); let taxSUm = await this.taxinfoDao.statCounts(companyNames);
for (var row of rows) { for (var row of rows) {
row.dzCount = electronMap[row.company_name] || 0; row.dzCount = electronMap[row.company_name] || 0;
...@@ -213,37 +213,37 @@ class MerchantService extends ServiceBase { ...@@ -213,37 +213,37 @@ class MerchantService extends ServiceBase {
row.wsCOunt = taxMap[row.company_name] || 0; row.wsCOunt = taxMap[row.company_name] || 0;
row.wsSum = taxSUm[row.company_name] || 0; row.wsSum = taxSUm[row.company_name] || 0;
} }
page.rows= rows; page.rows = rows;
return page; return page;
} }
async commercialList(params){ async commercialList(params) {
var db = ""; var db = "";
var firlt = ""; var firlt = "";
var page = {}; var page = {};
if(params.type == 1){ //招工 if (params.type == 1) { //招工
db = "recruit_info"; db = "recruit_info";
firlt = "publish_date" firlt = "publish_date"
page = await this.recruitSve.signPage(params); page = await this.recruitSve.signPage(params);
}else if(params.type == 2){//电子签约 } else if (params.type == 2) {//电子签约
db = "electronic_contract_info"; db = "electronic_contract_info";
firlt = "completed_date"; firlt = "completed_date";
page = await this.electroniccontractSve.signPage(params); page = await this.electroniccontractSve.signPage(params);
}else if(params.type == 3){//工作量 } else if (params.type == 3) {//工作量
db = "load_info"; db = "load_info";
firlt = "affirm_time"; firlt = "affirm_time";
page = await this.loadSve.signPage(params); page = await this.loadSve.signPage(params);
}else if(params.type == 4){//交易 } else if (params.type == 4) {//交易
db = "transaction_info"; db = "transaction_info";
firlt = "transaction_time"; firlt = "transaction_time";
page = await this.transactioninSve.signPage(params); page = await this.transactioninSve.signPage(params);
}else {//完税 } else {//完税
db = "tax_info"; db = "tax_info";
firlt = "tax_time"; firlt = "tax_time";
page = await this.taxinfoSve.signPage(params); page = await this.taxinfoSve.signPage(params);
} }
var sql = "SELECT DATE_FORMAT("+firlt+",'%Y-%m-%d') days,COUNT(id) COUNT FROM "+db+" WHERE 1=1"; 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 + " AND company_name = '" + params.company_name + "'"; sql = sql + " AND company_name = '" + params.company_name + "'";
...@@ -251,9 +251,10 @@ class MerchantService extends ServiceBase { ...@@ -251,9 +251,10 @@ class MerchantService extends ServiceBase {
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 = [[],[]]; sql = sql + " GROUP BY days ORDER BY days ASC";
var charts = [[], []];
var chart = await this.customQuery(sql); var chart = await this.customQuery(sql);
for(let i=0;i< chart.length;i++){ for (let i = 0; i < chart.length; i++) {
charts[0].push(chart[i].days); charts[0].push(chart[i].days);
charts[1].push(chart[i].COUNT) charts[1].push(chart[i].COUNT)
} }
...@@ -263,7 +264,7 @@ class MerchantService extends ServiceBase { ...@@ -263,7 +264,7 @@ class MerchantService extends ServiceBase {
} }
async commercialCountTo(params){ async commercialCountTo(params) {
let page = await this.electroniccontractSve.signPageGroup(params); let page = await this.electroniccontractSve.signPageGroup(params);
...@@ -287,9 +288,9 @@ class MerchantService extends ServiceBase { ...@@ -287,9 +288,9 @@ class MerchantService extends ServiceBase {
let traSUm = await this.transactioninDao.sCountS(companyNames); let traSUm = await this.transactioninDao.sCountS(companyNames);
// 完税人次 // 完税人次
let taxMap = await this.taxinfoDao.sCount(companyNames); let taxMap = await this.taxinfoDao.sCount(companyNames);
// 完税金额 // 完税金额
let taxSUm = await this.taxinfoDao.statCounts(companyNames); let taxSUm = await this.taxinfoDao.statCounts(companyNames);
for (var row of rows) { for (var row of rows) {
row.dzCount = electronMap[row.company_name] || 0; row.dzCount = electronMap[row.company_name] || 0;
...@@ -299,13 +300,53 @@ class MerchantService extends ServiceBase { ...@@ -299,13 +300,53 @@ class MerchantService extends ServiceBase {
row.wsCOunt = taxMap[row.company_name] || 0; row.wsCOunt = taxMap[row.company_name] || 0;
row.wsSum = taxSUm[row.company_name] || 0; row.wsSum = taxSUm[row.company_name] || 0;
} }
page.rows= rows; page.rows = rows;
return page; return page;
} }
async commercialCountToChares(){ async commercialCountToChares(params) {
var db = "";
var firlt = "";
var page = {};
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) {
sql = sql + " AND company_name = '" + params.company_name + "'";
}
if (params.sign_body) {
sql = sql + " AND sign_body = '" + params.sign_body + "'";
}
if(params.idno){
sql = sql + " AND id_no = '" + params.idno + "'";
}
sql = sql + " GROUP BY days ORDER BY days ASC";
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/base/service/impl/all/taxinfoSve.js
...@@ -20,6 +20,9 @@ class TaxinfoService extends ServiceBase { ...@@ -20,6 +20,9 @@ class TaxinfoService extends ServiceBase {
if(params.sign_body){ if(params.sign_body){
where.sign_body = params.sign_body; where.sign_body = params.sign_body;
} }
if(params.id_no){
where.id_no = params.id_no
}
this.addWhereTime(where, 'tax_time', params.signBegin, params.signEnd, true); this.addWhereTime(where, 'tax_time', params.signBegin, params.signEnd, true);
var orderby = [ var orderby = [
["id", 'desc'] ["id", 'desc']
......
bpo-stat/app/base/service/impl/all/transactioninSve.js
...@@ -20,6 +20,9 @@ class TransactioninService extends ServiceBase { ...@@ -20,6 +20,9 @@ class TransactioninService extends ServiceBase {
if(params.sign_body){ if(params.sign_body){
where.sign_body = params.sign_body; where.sign_body = params.sign_body;
} }
if(params.id_no){
where.id_no = params.id_no
}
this.addWhereTime(where, 'transaction_time', params.signBegin, params.signEnd, true); this.addWhereTime(where, 'transaction_time', params.signBegin, params.signEnd, true);
var orderby = [ var orderby = [
["id", 'desc'] ["id", 'desc']
......
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