税费承担明细表

application/index/controller/Finance.php

@@ -663,40 +663,42 @@ class Finance extends Basic
         $pageNo   = empty($this->params['pageNo']) ? 1 : $this->params['pageNo'];
         $pageSize = empty($this->params['pageSize']) ? 15 : $this->params['pageSize'];
 
-        $fields = 'a.id,a.create_time,b.user_phone,b.user_name,d.internal_title,d.internal_address,a.commission,a.practical_fee,a.scale_fee,a.order_no,content,house_number';
-        $where['a.father_id']    = 0;
-        $where['c.is_del']       = 0;
-        $where['a.status']       = 10;
+        $fields = 'a.id,a.create_time,e.name,e.phone,a.fee,b.house_number,d.internal_address,b.agent_id';
 
-        $order = 'e.id desc';
+        $where['c.is_del']       = 0;
+        $where['b.status']       = ['in', 10,11];   //10已提交 11审核成功
 
         if(!empty($this->params['create_time']) && empty($this->params['end_time'])) {
-            $where['e.create_time'] = ['> time', $this->params['create_time'] . ' 00:00:00'];
+            $where['a.create_time'] = ['> time', $this->params['create_time'] . ' 00:00:00'];
         }
 
         if(!empty($this->params['end_time']) && empty($this->params['create_time'])) {
-            $where['e.create_time'] = ['< time', $this->params['create_time'] . ' 23:59:59'];
+            $where['a.create_time'] = ['< time', $this->params['create_time'] . ' 23:59:59'];
         }
 
         if (!empty($this->params['end_time']) && !empty($this->params['create_time'])) {
-            $where['e.create_time'] = ['between time', [$this->params['create_time'] . ' 00:00:00', $this->params['create_time'] . ' 23:59:59']];
+            $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['user_phone'])) {
-            $where['b.user_phone'] = ['like', '%'.$this->params['user_phone'].'%'];
+        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['a.house_number'] = ['like', '%'.$this->params['house_number'].'%'];
+            $where['b.house_number'] = ['like', '%'.$this->params['house_number'].'%'];
         }
 
-        $bargain = new OBargainModel();
-        $data['data']['list']  = $bargain->getBargain($pageNo, $pageSize, $order, $fields, $where);
-        $data['data']['total'] = $bargain->getBargainTotal($where);
+        $m_fee = new OFee();
+        $data['data']['list']  = $m_fee->getFeeList($pageNo, $pageSize, 'a.id desc', $fields, $where);
+        $data['data']['total'] = $m_fee->getFeeListTotal($where);
 
         return $this->response($data['code'], $data['msg'], $data['data']);
     }

application/model/OFee.php

@@ -86,4 +86,57 @@ class OFee extends BaseModel
             ->where('type', $type)
             ->select();
     }
+
+    /**
+     * 税费承担明细表
+     *
+     * @param int $pageNo
+     * @param int $pageSize
+     * @param string $order_
+     * @param string $field
+     * @param string $params
+     * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function getFeeList($pageNo = 1, $pageSize = 15, $order_ = 'a.id desc', $field = '', $params = '') {
+        $data = $this->field($field)->alias('a')
+            ->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($params)
+            ->order($order_)
+            ->limit($pageSize)
+            ->page($pageNo)
+            ->select();
+
+        $m_agent = new AAgents();
+        foreach ($data as $k => $v) {
+            if (isset($v['agent_id'])) {
+                $district_store = $m_agent->getStoreDistrict('store_name,district_name', ['a.id'=>$v['agent_id']]);
+                $data[$k]['district_store'] = $district_store['district_name'] .'-'. $district_store['store_name'];
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * 税费承担明细表总数
+     *
+     * @param $params
+     * @return int|string
+     */
+    public function getFeeListTotal($params) {
+        return $this->alias('a')
+            ->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($params)
+            ->count();
+    }
+
+
 }
\ No newline at end of file