收款开业审核条件修改

application/index/controller/Finance.php

@@ -5005,10 +5005,86 @@ class Finance extends Basic
                 break;
         }
 
+        if ($this->params['create_start_time']) {
+            $where['a.create_time'] = ['>', $this->params['create_start_time']];
+        }
+
+        if ($this->params['create_end_time']) {
+            $where['a.create_time'] = ['>', $this->params['create_end_time']];
+        }
+        //提交时间区间
+        if ($this->params['create_start_time'] && $this->params['create_end_time']) {
+            $where['a.create_time'] = ['between', [$this->params['create_start_time'], $this->params['create_end_time']]];
+        }
+
+        if ($this->params['pass_start_time']) {
+            $where['b.create_time'] = ['>', $this->params['pass_start_time']];
+            $where['b.status'] = 1;
+        }
+
+        if ($this->params['pass_end_time']) {
+            $where['b.create_time'] = ['>', $this->params['pass_end_time']];
+            $where['b.status'] = 1;
+
+        }
+        //总监通过时间区间
+        if ($this->params['pass_start_time'] && $this->params['pass_end_time']) {
+            $where['b.create_time'] = ['between', [$this->params['pass_start_time'], $this->params['pass_end_time']]];
+            $where['b.status'] = 1;
+        }
+
+
+        if ($this->params['check_start_time']) {
+            $where['b.create_time'] = ['>', $this->params['check_start_time']];
+            $where['b.status'] = 3;
+        }
+
+        if ($this->params['check_end_time']) {
+            $where['b.create_time'] = ['>', $this->params['check_end_time']];
+            $where['b.status'] = 3;
+
+        }
+        //财务审核时间区间
+        if ($this->params['check_start_time'] && $this->params['check_end_time']) {
+            $where['b.create_time'] = ['between', [$this->params['check_start_time'], $this->params['check_end_time']]];
+            $where['b.status'] = 3;
+        }
+
+        //收款id
+        if (isset($this->params['pay_log_id'])) {
+            $where['a.pay_log_id'] = $this->params['pay_log_id'];
+        }
+
+        //成交报告id
+        if (isset($this->params['bargain_id'])) {
+            $where['a.bargain_id'] = $this->params['bargain_id'];
+        }
+
+        //带看订单ID
+        if (isset($this->params['order_id'])) {
+            $where['a.order_id'] = $this->params['order_id'];
+        }
+
+        //商铺ID
+        if (isset($this->params['house_id'])) {
+            $where['a.house_id'] = $this->params['house_id'];
+        }
+
+        //商铺地址
+        if (isset($this->params['house_address'])) {
+            $where['a.house_address'] = $this->params['house_address'];
+        }
+
+        //提交人id
+        if (isset($this->params['agent_id'])) {
+            $where['a.agent_id'] = $this->params['agent_id'];
+        }
+
         $where['a.is_del'] = 0;
-        $fields = 'a.id,a.create_time,a.agent_name,a.pay_log_id,a.bargain_id,a.order_id,a.house_id,a.house_address,a.status,b.create_time as disc_time,max(b.id) as two_id';
+        $fields = 'a.id,a.create_time,a.agent_id,a.pay_log_id,a.bargain_id,a.order_id,a.house_id,a.house_address,a.status,b.create_time as disc_time,max(b.id) as two_id';
         $m_pay_open = new OPayOpen();
         $m_pay_open_log = new OPayOpenLog();
+        $redis_service = new RedisCacheService();
         $list = $m_pay_open->getListCheck($pageNo, $pageSize, 'a.id desc', $fields, $where);
 
         if ($this->params['excel'] == 0) {
@@ -5021,6 +5097,8 @@ class Finance extends Basic
                     $list[$k]['check_time'] = '';
                 }
 
+                $agent_name = $redis_service->getRedisCache(2, $v['agent_id']);
+                $list[$k]['agent_name'] = $agent_name['name'];
                 unset($list[$k]['two_id']);
             }
             $data['list'] = $list;
@@ -5038,10 +5116,12 @@ class Finance extends Basic
                 $check_time = '';
             }
 
+            $agent_name = $redis_service->getRedisCache(2, $v['agent_id']);
+            $list[$k]['agent_name'] = $agent_name['name'];
             $excel_data[$k] = [
                 'id' => $v['id'],
                 'create_time' => $v['create_time'],
-                'agent_name' => $v['agent_name'],
+                'agent_name' => $agent_name,
                 'pay_log_id' => $v['pay_log_id'],
                 'bargain_id' => $v['bargain_id'],
                 'order_id' => $v['order_id'],