gsb

bpo-stat/.idea/codeStyles/codeStyleConfig.xml

+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>
\ No newline at end of file

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

@@ -212,7 +212,7 @@ class MerchantService extends ServiceBase {
         }
         let companyNames = [];
         for (var row of rows) {
-            companyNames.push(row.company_name);
+            companyNames.push(row.sign_body_id);
         }
         // 电子签约数量  company_name --> num
         let electronMap = await this.electroniccontractDao.statCount(companyNames, params.sign_body_id);
@@ -234,19 +234,19 @@ class MerchantService extends ServiceBase {
         let taxSUm = await this.taxinfoDao.statCounts(companyNames, params.sign_body_id);
 
         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 == "上海必博人力资源服务有限公司"){
-                row.jySum = "4634383.06";
-                row.wsCOunt = "54";
-                row.wsSum ="23122.45";
-            }
+            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;
+
+            // if(row.company_name == "上海必博人力资源服务有限公司"){
+            //     row.jySum = "4634383.06";
+            //     row.wsCOunt = "54";
+            //     row.wsSum ="23122.45";
+            // }
 
         }
         page.rows = rows;