分佣提成明细表搜索

application/index/controller/Finance.php

@@ -84,8 +84,8 @@ class Finance extends Basic
             $where['b.user_phone'] = ['like', '%'.$this->params['user_phone'].'%'];
         }
 
-        if (!empty($this->params['internal_title'])) {
-            $where['d.internal_title'] = ['like', '%'.$this->params['internal_title'].'%'];
+        if (!empty($this->params['house_number'])) {
+            $where['a.house_number'] = ['like', '%'.$this->params['house_number'].'%'];
         }
 
         switch ($this->params['check_status']) {
@@ -508,6 +508,35 @@ class Finance extends Basic
 
         $pageNo   = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
         $pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
+
+        if(!empty($this->params['create_time']) && empty($this->params['end_time'])) {
+            $where['a.create_time'] = ['> time', $this->params['create_time'] . ' 00:00:00'];
+        }
+
+        if(!empty($this->params['end_time']) && empty($this->params['create_time'])) {
+            $where['a.create_time'] = ['< time', $this->params['create_time'] . ' 23:59:59'];
+        }
+
+        if (!empty($this->params['end_time']) && !empty($this->params['create_time'])) {
+            $where['a.create_time'] = ['between time', [$this->params['create_time'] . ' 00:00:00', $this->params['create_time'] . ' 23:59:59']];
+        }
+
+        if (!empty($this->params['internal_address'])) {
+            $where['d.internal_address'] = ['like', '%'.$this->params['internal_address'].'%'];
+        }
+
+        if (!empty($this->params['phone'])) {
+            $where['e.phone'] = ['like', '%'.$this->params['phone'].'%'];
+        }
+
+        if (!empty($this->params['name'])) {
+            $where['e.name'] = ['like', '%'.$this->params['name'].'%'];
+        }
+
+        if (!empty($this->params['house_number'])) {
+            $where['b.house_number'] = ['like', '%'.$this->params['house_number'].'%'];
+        }
+
         $where = [];
         $field = 'a.id,a.create_time,a.practical_fee,b.scale_fee,d.internal_address,b.agent_id,b.house_number';
         $m_commission = new OPartialCommission();

application/model/OPartialCommission.php

@@ -30,6 +30,7 @@ class OPartialCommission extends BaseModel
             ->join('o_bargain b', 'a.bargain_id = b.id', 'left')
             ->join('o_order c', 'b.order_id = c.id', 'left')
             ->join('g_houses d', 'c.house_id = d.id', 'left')
+            ->join('a_agents e', 'b.agent_id = e.id','left')
             ->where($where)
             ->order($order_)
             ->limit($pageSize)