gsb

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

@@ -8,9 +8,11 @@ class TaxinfoCtl extends CtlBase {
 
 
     async allList(qobj){
     async allList(qobj){
         var params = qobj || {};
         var params = qobj || {};
-        var date = this.getMonthDays(params);
-        params.signBegin =date[0];
-        params.signEnd =date[date.length-1];
+        if (params.month) {
+            let date = this.getMonthDays(params.month);
+            params.signBegin =date[0];
+            params.signEnd =date[date.length-1];
+        }
         this.doTimeCondition(params, ["signBegin", "signEnd"]);
         this.doTimeCondition(params, ["signBegin", "signEnd"]);
         try {
         try {
             var page = await this.service.signPage(params);
             var page = await this.service.signPage(params);

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

@@ -125,14 +125,14 @@ class MerchantService extends ServiceBase {
             addTac: addTac || 0,//完税人次
             addTac: addTac || 0,//完税人次
             upTac: upTac || 0,
             upTac: upTac || 0,
 
 
-            addTacSum: addTacSum || 0,//完税金额
-            upTacSum: upTacSum || 0,
+            addTacSum: (addTacSum || 0).toFixed(2),//完税金额
+            upTacSum: (upTacSum || 0).toFixed(2),
 
 
             addTra: addTra || 0, //交易比数
             addTra: addTra || 0, //交易比数
             upTra: upTra || 0,
             upTra: upTra || 0,
 
 
-            addTraSum: addTraSum || 0,//交易金额
-            upTraSum: upTraSum || 0
+            addTraSum: (addTraSum || 0).toFixed(2),//交易金额
+            upTraSum: (upTraSum || 0).toFixed(2),
         };
         };
 
 
         return result;
         return result;