gsb

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

@@ -28,14 +28,14 @@ class electroniccontractDao extends Dao {
         return result;
     }
 
-    async sCount(inno) {
+    async sCount(inno,sign_body_id) {
         var result = {};
         if(!inno || inno.length == 0) {
             return result;
         }
-        var sql = "SELECT id_no, COUNT(1) AS num FROM `electronic_contract_info` WHERE id_no IN (:inno) GROUP BY id_no";
+        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});
+        let list = await this.customQuery(sql, {inno: inno,sign_body_id :sign_body_id});
 
         if(!list || list.length == 0) {
             return result;

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

@@ -28,14 +28,14 @@ class LoadDao extends Dao {
         return result;
     }
 
-    async sCount(inno) {
+    async sCount(inno,sign_body_id) {
         var result = {};
         if(!inno || inno.length == 0) {
             return result;
         }
-        var sql = "SELECT id_no, COUNT(1) AS num FROM `load_info` WHERE id_no IN (:inno) GROUP BY id_no";
+        var sql = "SELECT id_no, COUNT(1) AS num FROM `load_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});
+        let list = await this.customQuery(sql, {inno: inno,sign_body_id:sign_body_id});
 
         if(!list || list.length == 0) {
             return result;

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

@@ -49,14 +49,14 @@ class TaxinfoDao extends Dao {
         return result;
     }
 
-    async sCount(idno) {
+    async sCount(idno,sign_body_id) {
         var result = {};
         if(!idno || idno.length == 0) {
             return result;
         }
-        var sql = "SELECT id_no, COUNT(1) AS num FROM `tax_info` WHERE id_no IN (:idno) GROUP BY name";
+        var sql = "SELECT id_no, COUNT(1) AS num FROM `tax_info` WHERE sign_body_id = :sign_body_id AND id_no IN (:inno) GROUP BY name";
 
-        let list = await this.customQuery(sql, {idno: idno});
+        let list = await this.customQuery(sql, {inno: idno,sign_body_id:sign_body_id});
 
         if(!list || list.length == 0) {
             return result;

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

@@ -48,14 +48,14 @@ class TransactioninDao extends Dao {
         return result;
     }
 
-    async sCount(idno) {
+    async sCount(idno,sign_body_id) {
         var result = {};
         if(!idno || idno.length == 0) {
             return result;
         }
-        var sql = "SELECT id_no, COUNT(id_no) num FROM `transaction_info` WHERE id_no IN (:idno) GROUP BY id_no";
+        var sql = "SELECT id_no, COUNT(id_no) num FROM `transaction_info` WHERE sign_body_id = :sign_body_id AND id_no IN (:inno) GROUP BY id_no";
 
-        let list = await this.customQuery(sql, {idno: idno});
+        let list = await this.customQuery(sql, {inno: idno,sign_body_id:sign_body_id});
 
         if(!list || list.length == 0) {
             return result;
@@ -67,14 +67,14 @@ class TransactioninDao extends Dao {
     }
 
 
-    async sCountS(idno) {
+    async sCountS(idno,sign_body_id) {
         var result = {};
         if(!idno || idno.length == 0) {
             return result;
         }
-        var sql = "SELECT id_no, SUM(actual_amount) amount FROM `transaction_info` WHERE id_no IN (:idno) GROUP BY id_no";
+        var sql = "SELECT id_no, SUM(actual_amount) amount FROM `transaction_info` WHERE sign_body_id = :sign_body_id AND id_no IN (:inno) GROUP BY id_no";
 
-        let list = await this.customQuery(sql, {idno: idno});
+        let list = await this.customQuery(sql, {inno: idno,sign_body_id:sign_body_id});
 
         if(!list || list.length == 0) {
             return result;

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

@@ -59,7 +59,7 @@ class MerchantService extends ServiceBase {
         }
         var page = await this.dao.merchantInfo({id: params.id, sign_body_id: params.sign_body_id});
         if (page) {
-            for(var row of page ){
+            for (var row of page) {
                 this.handleDate(row, ["begin_time", "invalid_time"], "YYYY-MM-DD");
             }
         }
@@ -234,13 +234,15 @@ class MerchantService extends ServiceBase {
         let taxSUm = await this.taxinfoDao.statCounts(companyNames, params.sign_body_id);
 
         for (var row of rows) {
-            row.dzCount = electronMap[row.sign_body_id] || 0;
-            row.zgCount = recruitMap[row.sign_body_id] || 0;
-            row.gzCount = loadMap[row.sign_body_id] || 0;
-            row.jyCOunt = traMap[row.sign_body_id] || 0;
-            row.jySum = traSUm[row.sign_body_id].toFixed(2) || 0;
-            row.wsCOunt = taxMap[row.sign_body_id] || 0;
-            row.wsSum = taxSUm[row.sign_body_id].toFixed(2) || 0;
+            row.dzCount = electronMap[row.company_name] || 0;
+            row.zgCount = recruitMap[row.company_name] || 0;
+            row.gzCount = loadMap[row.company_name] || 0;
+            row.jyCOunt = traMap[row.company_name] || 0;
+            let traSUM = traSUm[row.company_name] || 0;
+            row.jySum = traSUM.toFixed(2)
+            row.wsCOunt = taxMap[row.company_name] || 0;
+            let taxsum = taxSUm[row.company_name] || 0;
+            row.wsSum = taxsum.toFixed(2)
 
             // if(row.company_name == "上海必博人力资源服务有限公司"){
             //     row.jySum = "4634383.06";
@@ -318,20 +320,20 @@ class MerchantService extends ServiceBase {
             companyNames.push(row.id_no);
         }
         // 电子签约数量
-        let electronMap = await this.electroniccontractDao.sCount(companyNames);
+        let electronMap = await this.electroniccontractDao.sCount(companyNames,params.sign_body_id);
 
         // 工作量确认单
-        let loadMap = await this.loadDao.sCount(companyNames);
+        let loadMap = await this.loadDao.sCount(companyNames,params.sign_body_id);
 
         // 交易笔数
-        let traMap = await this.transactioninDao.sCount(companyNames);
+        let traMap = await this.transactioninDao.sCount(companyNames,params.sign_body_id);
         //交易金额
-        let traSUm = await this.transactioninDao.sCountS(companyNames);
+        let traSUm = await this.transactioninDao.sCountS(companyNames,params.sign_body_id);
 
         // 完税人次
-        let taxMap = await this.taxinfoDao.sCount(companyNames);
+        let taxMap = await this.taxinfoDao.sCount(companyNames,params.sign_body_id);
         // 完税金额
-        let taxSUm = await this.taxinfoDao.sCount(companyNames);
+        let taxSUm = await this.taxinfoDao.sCount(companyNames,params.sign_body_id);
 
         for (var row of rows) {
             row.dzCount = electronMap[row.id_no] || 0;