gsb

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

@@ -34,7 +34,7 @@ class electroniccontractDao extends Dao {
 
         let list = await this.customQuery(sql, {inno: inno});
 
-        if(list || list.length == 0) {
+        if(!list || list.length == 0) {
             return result;
         }
 

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

@@ -34,7 +34,7 @@ class LoadDao extends Dao {
 
         let list = await this.customQuery(sql, {inno: inno});
 
-        if(list || list.length == 0) {
+        if(!list || list.length == 0) {
             return result;
         }
 

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

@@ -51,7 +51,7 @@ class TaxinfoDao extends Dao {
 
         let list = await this.customQuery(sql, {idno: idno});
 
-        if(list || list.length == 0) {
+        if(!list || list.length == 0) {
             return result;
         }
 
@@ -70,12 +70,12 @@ class TaxinfoDao extends Dao {
 
         let list = await this.customQuery(sql, {inno: inno});
 
-        if(list || list.length == 0) {
+        if(!list || list.length == 0) {
             return result;
         }
 
         for (var item of list) {
-            result[item.id_no] = item.num || 0;
+            result[item.id_no] = parseFloat((item.num || 0).toFixed(2));
         }
         return result;
     }

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

@@ -53,11 +53,11 @@ class TransactioninDao extends Dao {
 
         let list = await this.customQuery(sql, {idno: idno});
 
-        if(list || list.length == 0) {
+        if(!list || list.length == 0) {
             return result;
         }
         for (var item of list) {
-            result[item.num] = item.amount || 0;
+            result[item.id_no] = item.num || 0;
         }
         return result;
     }
@@ -72,11 +72,11 @@ class TransactioninDao extends Dao {
 
         let list = await this.customQuery(sql, {idno: idno});
 
-        if(list || list.length == 0) {
+        if(!list || list.length == 0) {
             return result;
         }
         for (var item of list) {
-            result[item.amount] = item.amount || 0;
+            result[item.id_no] = parseFloat((item.amount || 0).toFixed(2));
         }
         return result;
     }

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

@@ -304,12 +304,12 @@ class MerchantService extends ServiceBase {
         let taxSUm = await this.taxinfoDao.statCounts(companyNames);
 
         for (var row of rows) {
-            row.dzCount = electronMap[row.company_name] || 0;
-            row.gzCount = loadMap[row.company_name] || 0;
-            row.jyCOunt = traMap[row.company_name] || 0;
-            row.jySum = traSUm[row.company_name] || 0;
-            row.wsCOunt = taxMap[row.company_name] || 0;
-            row.wsSum = taxSUm[row.company_name] || 0;
+            row.dzCount = electronMap[row.id_no] || 0;
+            row.gzCount = loadMap[row.id_no] || 0;
+            row.jyCOunt = traMap[row.id_no] || 0;
+            row.jySum = traSUm[row.id_no] || 0;
+            row.wsCOunt = taxMap[row.id_no] || 0;
+            row.wsSum = taxSUm[row.id_no] || 0;
         }
         page.rows = rows;
         return page;