gsb

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

@@ -123,9 +123,68 @@ class MerchantCtl extends CtlBase {
         }
     }
 
+    async merchantInfo(qobj) {
+        var obj = [
+            {
+                label: '服务商名称：',
+                value: '舟山兰和科技有限公司'
+            }, {
+                label: '联系人姓名：',
+                value: '钟韬晨'
+            }, {
+                label: '联系人手机：',
+                value: '17780611107'
+            }, {
+                label: '联系地址：',
+                value: '浙江省舟山市定海区舟山港总和保税区企业服务中心01-3045室'
+            }, {
+                label: '开户行：',
+                value: '浙商银行舟山分行营业部'
+            }, {
+                label: '对公账户：',
+                value: '3420020010120100174002'
+            }
+        ];
+        var obj1 = [
+            {
+                label: '合作方：',
+                value: '开封市薪企云服人力资源服务有限公司'
+            }, {
+                label: '合作方地址：',
+                value: '开封市鼓楼区省府西街33号嘉斯茂金品数码广场2层1区202'
+            }, {
+                label: '合作方开户行：',
+                value: '中原银行股份有限公司开封卧龙支行'
+            }, {
+                label: '合作方对公账户：',
+                value: '410214010160010701'
+            }, {
+                label: '签约合同：',
+                value: '浙商银行舟山分行营业部'
+            }
+        ];
+
+        var contractUrl = "https://gsb-zc.oss-cn-beijing.aliyuncs.com//zc_7711157622797891420191317618914兰和-开封.pdf";
+        if (qobj.sign_body != "舟山兰和科技有限公司") {
+            for(var item of obj) {
+                item.value = "";
+            }
+            for(var item1 of obj1) {
+                item1.value = "";
+            }
+            contractUrl = "";
+        }
+        var rs = {};
+        rs.obj = obj;
+        rs.obj1 = obj1;
+        rs.contractUrl = contractUrl;
+        return system.getResultSuccess(rs);
+    }
+}
+
+
 
 
 
-}
 
 module.exports = MerchantCtl;
\ No newline at end of file

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

@@ -22,6 +22,10 @@ class InvoiceService extends ServiceBase {
       where.invoiceType = Number(params.invoiceType);
     }
 
+    if(params.sign_body) {
+      where.sign_body = params.sign_body;
+    }
+
     this.addWhereTime(where, 'invoice_time', params.signBegin, params.signEnd);
 
     var orderby = [

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

@@ -56,7 +56,7 @@ class MerchantService extends ServiceBase {
 
 
         var addMer = await this.findCount({where: where});//商户新增
-        var upMer = await this.findCount(wheres);//累积
+        var upMer = await this.findCount({where: wheres});//累积
         var where_ele = {};
         if (params.sign_body) {
             where_ele.sign_body = params.sign_body;
@@ -64,17 +64,17 @@ class MerchantService extends ServiceBase {
         this.addWhereTime(where_ele, 'completed_date', params.signBegin, params.signEnd, true);
 
         var addEle = await this.electroniccontractDao.findCount({where: where_ele});//电子签新增
-        var upEle = await this.electroniccontractDao.findCount(wheres);//累积
+        var upEle = await this.electroniccontractDao.findCount({where: wheres});//累积
 
 
         var where_loa = {};
         if (params.sign_body) {
-            where_ele.sign_body = params.sign_body;
+            where_loa.sign_body = params.sign_body;
         }
         this.addWhereTime(where_loa, 'affirm_time', params.signBegin, params.signEnd, true);
 
         var addLoad = await this.loadDao.findCount({where: where_loa});//工作量新增
-        var upLoad = await this.loadDao.findCount(wheres);//
+        var upLoad = await this.loadDao.findCount({where: wheres});//
 
 
         var where_rec = {};
@@ -84,7 +84,7 @@ class MerchantService extends ServiceBase {
         this.addWhereTime(where_rec, 'publish_date', params.signBegin, params.signEnd, true);
 
         var addrec = await this.recruitDao.findCount({where: where_rec});//招聘需求
-        var upRec = await this.recruitDao.findCount(wheres);
+        var upRec = await this.recruitDao.findCount({where: wheres});
 
         var where_tax = {};
         if (params.sign_body) {
@@ -93,10 +93,10 @@ class MerchantService extends ServiceBase {
         this.addWhereTime(where_tax, 'tax_time', params.signBegin, params.signEnd, true);
 
         var addTac = await this.taxinfoDao.findCount({where: where_tax});//完税人次
-        var upTac = await this.taxinfoDao.findCount(wheres);
+        var upTac = await this.taxinfoDao.findCount({where: wheres});
 
         var addTacSum = await this.taxinfoDao.findSum("income_tax", {where: where_tax});//完税金额
-        var upTacSum = await this.taxinfoDao.findSum("income_tax", wheres);
+        var upTacSum = await this.taxinfoDao.findSum("income_tax", {where: wheres});
 
         var where_tra = {};
         if (params.sign_body) {
@@ -104,10 +104,10 @@ class MerchantService extends ServiceBase {
         }
         this.addWhereTime(where_tra, 'transaction_time', params.signBegin, params.signEnd, true);
         var addTra = await this.transactioninDao.findCount({where: where_tra});//交易比数
-        var upTra = await this.transactioninDao.findCount(wheres);
+        var upTra = await this.transactioninDao.findCount({where: wheres});
 
         var addTraSum = await this.transactioninDao.findSum("actual_amount", {where: where_tra});//交易金额
-        var upTraSum = await this.transactioninDao.findSum("actual_amount", wheres);
+        var upTraSum = await this.transactioninDao.findSum("actual_amount", {where: wheres});
 
         var result = {
             addMer: addMer || 0,//商户新增