Merge branch 'bpo-stat' of gitlab.gongsibao.com:jiangyong/zhichan into bpo-stat

bpo-stat/app/base/controller/ctl.base.js

 const system = require("../system");
 const settings = require("../../config/settings");
+const moment = require("moment");
 class CtlBase {
   constructor(gname, sname) {
     this.serviceName = sname;
@@ -145,5 +146,27 @@ class CtlBase {
     }
     return source.substring(source.length - str.length) == str;
   }
+
+  getMonthDays(month) {
+    let begin = moment(month).format("YYYY-MM") + "-01 00:00:00";
+    let end = moment(begin).add(1, "months").subtract(1, 'days').format("YYYY-MM-DD") + " 23:59:59";
+
+    return this.getDays(end);
+
+  }
+
+  getDays(end) {
+    var days = [];
+    var month = moment(end).format("YYYY-MM");
+    var endDay = Number(moment(end).format("DD"));
+    for (var i = 1; i <= endDay; i++) {
+      if (i < 10) {
+        days.push(month + "-0" + i);
+      } else {
+        days.push(month + "-" + i);
+      }
+    }
+    return days;
+  }
 }
 module.exports = CtlBase;

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

@@ -20,6 +20,9 @@ class MerchantCtl extends CtlBase {
     //数据概览
     async dataSummarize(qobj){
         var params = qobj || {};
+        var date = this.getMonthDays(params);
+        params.signBegin =date[0];
+        params.signEnd =date[date.length-1];
         this.doTimeCondition(params, ["signBegin", "signEnd"]);
         try {
             var page = await this.service.dataSummarize(params);
@@ -33,6 +36,10 @@ class MerchantCtl extends CtlBase {
     //首页图表
     async dataChart(qobj){
         var params = qobj || {};
+        var date = this.getMonthDays(params);
+        params.signBegin =date[0];
+        params.signEnd =date[date.length-1];
+        this.doTimeCondition(params, ["signBegin", "signEnd"]);
         try {
             var page = await this.service.dataChart(params);
             return system.getResult2(page);
@@ -55,6 +62,9 @@ class MerchantCtl extends CtlBase {
     //统计商户报表 详情
     async commercialList(qobj){
         var params = qobj || {};
+        var date = this.getMonthDays(params);
+        params.signBegin =date[0];
+        params.signEnd =date[date.length-1];
         try {
             var page = await this.service.commercialList(params);
             return system.getResult2(page);
@@ -80,6 +90,9 @@ class MerchantCtl extends CtlBase {
     //统计报表 个人 图表
     async commercialCountToChares(qobj){
         var params = qobj || {};
+        var date = this.getMonthDays(params);
+        params.signBegin =date[0];
+        params.signEnd =date[date.length-1];
         try {
             var page = await this.service.commercialCountToChares(params);
             return system.getResult2(page);

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

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

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

@@ -152,8 +152,8 @@ class MerchantService extends ServiceBase {
             sqls = sqls + " AND sign_body = '" + params.sign_body + "'";
         }
         if (params.signBegin || params.signEnd) {
-            sql = sql + " AND completed_date >= '" + params.signBegin + " 00:00:00' AND completed_date <= '" + params.signEnd + " 23:59:59'";
-            sqls = sqls + " AND transaction_time >= '" + params.signBegin + " 00:00:00' AND transaction_time <= '" + params.signEnd + " 23:59:59'";
+            sql = sql + " AND completed_date >= '" + params.signBegin + "' AND completed_date <= '" + params.signEnd + "'";
+            sqls = sqls + " AND transaction_time >= '" + params.signBegin + "' AND transaction_time <= '" + params.signEnd + "'";
         }
         sql = sql + " GROUP BY days ORDER BY days ASC";
         sqls = sqls + " GROUP BY days ORDER BY days ASC";