gsb

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

@@ -17,9 +17,14 @@ class electroniccontractDao extends Dao {
         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, {sign_body_id: sign_body_id});
+
         if(!list || list.length == 0) {
         if(!list || list.length == 0) {
             return result;
             return result;
         }
         }
+        for (var item of list) {
+            result[item.company_name] = item.num || 0;
+        }
+
         return result;
         return result;
     }
     }
 
 

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

@@ -234,22 +234,18 @@ class MerchantService extends ServiceBase {
         let taxSUm = await this.taxinfoDao.statCounts(companyNames, params.sign_body_id);
         let taxSUm = await this.taxinfoDao.statCounts(companyNames, params.sign_body_id);
 
 
         for (var row of rows) {
         for (var row of rows) {
+            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;
+            row.jySum = traSUm[row.company_name].toFixed(2) || 0;
+            row.wsCOunt = taxMap[row.company_name] || 0;
+            row.wsSum = taxSUm[row.company_name].toFixed(2) || 0;
+
             if(row.company_name == "上海必博人力资源服务有限公司"){
             if(row.company_name == "上海必博人力资源服务有限公司"){
-                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;
                 row.jySum = "4634383.06";
                 row.jySum = "4634383.06";
                 row.wsCOunt = "54";
                 row.wsCOunt = "54";
                 row.wsSum ="23122.45";
                 row.wsSum ="23122.45";
-            }else {
-                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;
-                row.jySum = traSUm[row.company_name].toFixed(2) || 0;
-                row.wsCOunt = taxMap[row.company_name] || 0;
-                row.wsSum = taxSUm[row.company_name].toFixed(2) || 0;
             }
             }
 
 
         }
         }