gsb

bpo-stat/app/base/controller/impl/all/merchantCtl.js

-var system = require("../../../system")
+const system = require("../../../system")
 const CtlBase = require("../../ctl.base");
 
 //商户信息

bpo-stat/app/base/db/impl/all/electroniccontractDao.js

@@ -6,19 +6,27 @@ class electroniccontractDao extends Dao {
         super(Dao.getModelName(electroniccontractDao));
     }
 
-    async statCount(companyNames, sign_body_id) {
+    async statCount(companyNames, sign_body_id,sign_body) {
         var result = {};
-        var sql = "SELECT company_name, COUNT(1) AS num FROM electronic_contract_info WHERE 1=1 ";
+        if (!companyNames || companyNames.length == 0) {
+            return result;
+        }
+
+        var sql = "SELECT company_name, COUNT(1) AS num FROM electronic_contract_info WHERE company_name IN (:companyNames) ";
 
         if (sign_body_id) {
-            sql = sql +"AND sign_body_id = :sign_body_id";
+            sql = sql + " AND sign_body_id = :sign_body_id";
+        }
+
+        if (sign_body) {
+            sql = sql + " AND sign_body = :sign_body";
         }
 
-        sql = sql+ " GROUP BY company_name";
+        sql = sql + " GROUP BY company_name";
 
-        let list = await this.customQuery(sql, {sign_body_id: sign_body_id});
+        let list = await this.customQuery(sql, {companyNames: companyNames, sign_body_id: sign_body_id,sign_body:sign_body});
 
-        if(!list || list.length == 0) {
+        if (!list || list.length == 0) {
             return result;
         }
         for (var item of list) {
@@ -28,16 +36,16 @@ class electroniccontractDao extends Dao {
         return result;
     }
 
-    async sCount(inno,sign_body_id) {
+    async sCount(inno, sign_body_id) {
         var result = {};
-        if(!inno || inno.length == 0) {
+        if (!inno || inno.length == 0) {
             return result;
         }
         var sql = "SELECT id_no, COUNT(1) AS num FROM `electronic_contract_info` WHERE sign_body_id = :sign_body_id AND id_no IN (:inno) GROUP BY id_no";
 
-        let list = await this.customQuery(sql, {inno: inno,sign_body_id :sign_body_id});
+        let list = await this.customQuery(sql, {inno: inno, sign_body_id: sign_body_id});
 
-        if(!list || list.length == 0) {
+        if (!list || list.length == 0) {
             return result;
         }
 
@@ -53,7 +61,7 @@ class electroniccontractDao extends Dao {
         this.setSqlParams(params, sql);
         let rs = await this.customQuery(sql.join(" "), params);
 
-        if(rs && rs.length > 0) {
+        if (rs && rs.length > 0) {
             return rs[0].num || 0;
         }
         return 0;
@@ -76,10 +84,10 @@ class electroniccontractDao extends Dao {
         if (params.company_name) {
             sql.push("AND company_name = :company_name");
         }
-        if(params.sign_body_id){
+        if (params.sign_body_id) {
             sql.push("AND sign_body_id = :sign_body_id");
         }
-        if(params.id_no) {
+        if (params.id_no) {
             sql.push("AND id_no = :id_no");
         }
         if (params.signBegin) {

bpo-stat/app/base/db/impl/all/loadDao.js

@@ -6,17 +6,20 @@ class LoadDao extends Dao {
         super(Dao.getModelName(LoadDao));
     }
 
-    async statCount(companyNames, sign_body_id) {
+    async statCount(companyNames, sign_body_id,sign_body) {
         var result = {};
 
         var sql = "SELECT company_name, COUNT(1) AS num FROM load_info WHERE  1=1";
         if (sign_body_id) {
            sql = sql +" AND sign_body_id = :sign_body_id";
         }
+        if (sign_body) {
+           sql = sql +" AND sign_body = :sign_body";
+        }
 
         sql = sql +" GROUP BY company_name";
 
-        let list = await this.customQuery(sql, {sign_body_id: sign_body_id});
+        let list = await this.customQuery(sql, {sign_body_id: sign_body_id,sign_body:sign_body});
 
         if(!list || list.length == 0) {
             return result;

bpo-stat/app/base/db/impl/all/recruitDao.js

@@ -6,18 +6,21 @@ class RecruitDao extends Dao {
         super(Dao.getModelName(RecruitDao));
     }
 
-    async statCount(companyNames, sign_body_id) {
+    async statCount(companyNames, sign_body_id,sign_body) {
         var result = {};
-        var sql = "SELECT company_name, COUNT(1) AS num FROM recruit_info WHERE 1=1  ";
+        var sql = "SELECT company_name, COUNT(1) AS num FROM recruit_info WHERE 1=1 ";
 
 
         if (sign_body_id) {
-           sql = sql + "AND sign_body_id = :sign_body_id";
+           sql = sql + " AND sign_body_id = :sign_body_id";
+        }
+        if (sign_body) {
+           sql = sql + " AND sign_body = :sign_body";
         }
 
         sql = sql + " GROUP BY company_name"
 
-        let list = await this.customQuery(sql, {sign_body_id: sign_body_id});
+        let list = await this.customQuery(sql, {sign_body_id: sign_body_id,sign_body:sign_body});
 
         if(!list || list.length == 0) {
             return result;

bpo-stat/app/base/db/impl/all/taxinfoDao.js

@@ -5,18 +5,21 @@ class TaxinfoDao extends Dao {
     constructor() {
         super(Dao.getModelName(TaxinfoDao));
     }
-    async statCount(companyNames, sign_body_id) {
+    async statCount(companyNames, sign_body_id,sign_body) {
         var result = {};
         var sql = "SELECT company_name, COUNT(1) AS num FROM tax_info WHERE 1=1";
 
         if (sign_body_id) {
             sql = sql + " AND sign_body_id = :sign_body_id";
         }
+        if (sign_body) {
+            sql = sql + " AND sign_body = :sign_body";
+        }
 
         sql = sql + " GROUP BY company_name"
 
 
-        let list = await this.customQuery(sql, {sign_body_id: sign_body_id});
+        let list = await this.customQuery(sql, {sign_body_id: sign_body_id,sign_body:sign_body});
 
         if(!list || list.length == 0) {
             return result;
@@ -27,7 +30,7 @@ class TaxinfoDao extends Dao {
         }
         return result;
     }
-    async statCounts(companyNames, sign_body_id) {
+    async statCounts(companyNames, sign_body_id,sign_body) {
         var result = {};
         var sql = "SELECT company_name, SUM(income_tax) AS num FROM tax_info WHERE 1=1 ";
 
@@ -35,9 +38,12 @@ class TaxinfoDao extends Dao {
         if (sign_body_id) {
           sql = sql + " AND sign_body_id = :sign_body_id";
         }
+        if (sign_body) {
+          sql = sql + " AND sign_body = :sign_body";
+        }
         sql = sql + " GROUP BY company_name";
 
-        let list = await this.customQuery(sql, {sign_body_id: sign_body_id});
+        let list = await this.customQuery(sql, {sign_body_id: sign_body_id,sign_body});
 
         if(!list || list.length == 0) {
             return result;

bpo-stat/app/base/db/impl/all/transactioninDao.js

@@ -5,17 +5,20 @@ class TransactioninDao extends Dao {
     constructor() {
         super(Dao.getModelName(TransactioninDao));
     }
-    async statCount(companyNames, sign_body_id) {
+    async statCount(companyNames, sign_body_id,sign_body) {
         var sql = "SELECT company_name, COUNT(1) AS num FROM transaction_info WHERE 1=1 ";
         var result = {};
 
         if (sign_body_id) {
             sql = sql +" AND sign_body_id = :sign_body_id";
         }
+        if (sign_body) {
+            sql = sql +" AND sign_body = :sign_body";
+        }
 
        sql = sql+ "  GROUP BY company_name"
 
-        let list = await this.customQuery(sql, {sign_body_id: sign_body_id});
+        let list = await this.customQuery(sql, {sign_body_id: sign_body_id,sign_body:sign_body});
 
         if(!list || list.length == 0) {
             return result;
@@ -27,15 +30,18 @@ class TransactioninDao extends Dao {
         return result;
     }
 
-    async statCounts(companyNames, sign_body_id) {
+    async statCounts(companyNames, sign_body_id,sign_body) {
         var result = {};
         var sql = "SELECT company_name, SUM(actual_amount) amount FROM transaction_info WHERE 1=1 ";
         if (sign_body_id) {
            sql = sql + " AND sign_body_id = :sign_body_id";
         }
+        if (sign_body) {
+           sql = sql + " AND sign_body = :sign_body";
+        }
         sql =sql + " GROUP BY company_name"
 
-        let list = await this.customQuery(sql, {sign_body_id: sign_body_id});
+        let list = await this.customQuery(sql, {sign_body_id: sign_body_id,sign_body:sign_body});
 
         if(!list || list.length == 0) {
             return result;

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

@@ -20,6 +20,9 @@ class ElectronicContractService extends ServiceBase {
         if(params.sign_body_id){
             where.sign_body_id = params.sign_body_id;
         }
+        if(params.sign_body){
+            where.sign_body = params.sign_body;
+        }
         if(params.id_no){
             where.id_no = params.id_no
         }

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

@@ -22,6 +22,9 @@ class LoadService extends ServiceBase {
         if(params.sign_body_id){
             where.sign_body_id = params.sign_body_id;
         }
+        if(params.sign_body){
+            where.sign_body = params.sign_body;
+        }
         if(params.id_no){
             where.id_no = params.id_no
         }

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

@@ -212,26 +212,26 @@ class MerchantService extends ServiceBase {
         }
         let companyNames = [];
         for (var row of rows) {
-            companyNames.push(row.sign_body_id);
+            companyNames.push(row.company_name);
         }
         // 电子签约数量  company_name --> num
-        let electronMap = await this.electroniccontractDao.statCount(companyNames, params.sign_body_id);
+        let electronMap = await this.electroniccontractDao.statCount(companyNames, params.sign_body_id,params.sign_body);
 
         // 招工需求
-        let recruitMap = await this.recruitDao.statCount(companyNames, params.sign_body_id);
+        let recruitMap = await this.recruitDao.statCount(companyNames, params.sign_body_id,params.sign_body);
 
         // 工作量确认单
-        let loadMap = await this.loadDao.statCount(companyNames, params.sign_body_id);
+        let loadMap = await this.loadDao.statCount(companyNames, params.sign_body_id,params.sign_body);
 
         // 交易笔数、交易金额
-        let traMap = await this.transactioninDao.statCount(companyNames, params.sign_body_id);
+        let traMap = await this.transactioninDao.statCount(companyNames, params.sign_body_id,params.sign_body);
         //交易金额
-        let traSUm = await this.transactioninDao.statCounts(companyNames, params.sign_body_id);
+        let traSUm = await this.transactioninDao.statCounts(companyNames, params.sign_body_id,params.sign_body);
 
         // 完税人次
-        let taxMap = await this.taxinfoDao.statCount(companyNames, params.sign_body_id);
+        let taxMap = await this.taxinfoDao.statCount(companyNames, params.sign_body_id,params.sign_body);
         // 完税金额
-        let taxSUm = await this.taxinfoDao.statCounts(companyNames, params.sign_body_id);
+        let taxSUm = await this.taxinfoDao.statCounts(companyNames, params.sign_body_id,params.sign_body);
 
         for (var row of rows) {
             row.dzCount = electronMap[row.company_name] || 0;

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

@@ -20,6 +20,9 @@ class RecruitService extends ServiceBase {
         if(params.sign_body_id){
             where.sign_body_id = params.sign_body_id;
         }
+        if(params.sign_body){
+            where.sign_body = params.sign_body;
+        }
         if(params.status){
             where.status = params.status;
         }

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

@@ -27,6 +27,11 @@ class TransactioninService extends ServiceBase {
         if(params.sign_body_id){
             where.sign_body_id = params.sign_body_id;
         }
+
+        if(params.sign_body){
+            where.sign_body = params.sign_body;
+        }
+
         if(params.id_no){
             where.id_no = params.id_no
         }