gsb

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

@@ -225,18 +225,22 @@ class MerchantService extends ServiceBase {
         if (params.type == 1) { //招工
             db = "recruit_info";
             firlt = "publish_date"
+            this.doTimeCondition(params, ["signBegin", "signEnd"]);
             page = await this.recruitSve.signPage(params);
         } else if (params.type == 2) {//电子签约
             db = "electronic_contract_info";
             firlt = "completed_date";
+            this.doTimeCondition(params, ["signBegin", "signEnd"]);
             page = await this.electroniccontractSve.signPage(params);
         } else if (params.type == 3) {//工作量
             db = "load_info";
             firlt = "affirm_time";
+            this.doTimeCondition(params, ["signBegin", "signEnd"]);
             page = await this.loadSve.signPage(params);
         } else if (params.type == 4) {//交易
             db = "transaction_info";
             firlt = "transaction_time";
+            this.doTimeCondition(params, ["signBegin", "signEnd"]);
             page = await this.transactioninSve.signPage(params);
         } else {//完税
             db = "tax_info";
@@ -309,21 +313,25 @@ class MerchantService extends ServiceBase {
         var db = "";
         var firlt = "";
         var page = {};
-        if (params.type == 2) {//电子签约
+        if (params.type == 1) {//电子签约
             db = "electronic_contract_info";
             firlt = "completed_date";
+            this.doTimeCondition(params, ["signBegin", "signEnd"]);
             page = await this.electroniccontractSve.signPage(params);
-        } else if (params.type == 3) {//工作量
+        } else if (params.type == 2) {//工作量
             db = "load_info";
             firlt = "affirm_time";
+            this.doTimeCondition(params, ["signBegin", "signEnd"]);
             page = await this.loadSve.signPage(params);
-        } else if (params.type == 4) {//交易
+        } else if (params.type == 3) {//交易
             db = "transaction_info";
             firlt = "transaction_time";
+            this.doTimeCondition(params, ["signBegin", "signEnd"]);
             page = await this.transactioninSve.signPage(params);
         } else {//完税
             db = "tax_info";
             firlt = "tax_time";
+            this.doTimeCondition(params, ["signBegin", "signEnd"]);
             page = await this.taxinfoSve.signPage(params);
         }
         var sql = "SELECT DATE_FORMAT(" + firlt + ",'%Y-%m-%d') days,COUNT(id) COUNT FROM " + db + " WHERE 1=1";