gsb

bpo-stat/app/base/service/impl/all/electroniccontractSve.js

@@ -20,6 +20,9 @@ class ElectronicContractService extends ServiceBase {
         if(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);
         var orderby = [
             ["id", 'desc']

bpo-stat/app/base/service/impl/all/loadSve.js

@@ -20,6 +20,9 @@ class LoadService extends ServiceBase {
         if(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);
         var orderby = [
             ["id", 'desc']

bpo-stat/app/base/service/impl/all/merchantSve.js

@@ -173,7 +173,7 @@ class MerchantService extends ServiceBase {
         return result || [];
     }
 
-    async commercialCount(params){
+    async commercialCount(params) {
 
         let page = await this.signPage(params);
 
@@ -213,37 +213,37 @@ class MerchantService extends ServiceBase {
             row.wsCOunt = taxMap[row.company_name] || 0;
             row.wsSum = taxSUm[row.company_name] || 0;
         }
-         page.rows= rows;
+        page.rows = rows;
         return page;
 
     }
 
-    async commercialList(params){
+    async commercialList(params) {
         var db = "";
         var firlt = "";
         var page = {};
-        if(params.type == 1){ //招工
+        if (params.type == 1) { //招工
             db = "recruit_info";
             firlt = "publish_date"
             page = await this.recruitSve.signPage(params);
-        }else if(params.type == 2){//电子签约
+        } else if (params.type == 2) {//电子签约
             db = "electronic_contract_info";
             firlt = "completed_date";
             page = await this.electroniccontractSve.signPage(params);
-        }else if(params.type == 3){//工作量
+        } else if (params.type == 3) {//工作量
             db = "load_info";
             firlt = "affirm_time";
             page = await this.loadSve.signPage(params);
-        }else if(params.type == 4){//交易
+        } else if (params.type == 4) {//交易
             db = "transaction_info";
             firlt = "transaction_time";
             page = await this.transactioninSve.signPage(params);
-        }else {//完税
+        } 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";
+        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 + "'";
@@ -251,9 +251,10 @@ class MerchantService extends ServiceBase {
         if (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);
-        for(let i=0;i< chart.length;i++){
+        for (let i = 0; i < chart.length; i++) {
             charts[0].push(chart[i].days);
             charts[1].push(chart[i].COUNT)
         }
@@ -263,7 +264,7 @@ class MerchantService extends ServiceBase {
     }
 
 
-    async commercialCountTo(params){
+    async commercialCountTo(params) {
 
         let page = await this.electroniccontractSve.signPageGroup(params);
 
@@ -299,13 +300,53 @@ class MerchantService extends ServiceBase {
             row.wsCOunt = taxMap[row.company_name] || 0;
             row.wsSum = taxSUm[row.company_name] || 0;
         }
-        page.rows= rows;
+        page.rows = rows;
         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 {
         if(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);
         var orderby = [
             ["id", 'desc']

bpo-stat/app/base/service/impl/all/transactioninSve.js

@@ -20,6 +20,9 @@ class TransactioninService extends ServiceBase {
         if(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);
         var orderby = [
             ["id", 'desc']