Commit ca0fa546 authored by hujun's avatar hujun

优化

parent cf7fdffd
...@@ -261,6 +261,8 @@ class Finance extends Basic ...@@ -261,6 +261,8 @@ class Finance extends Basic
if ($is_show) { if ($is_show) {
$data['data']['total_commission'] = $this->m_bargain->getBargainListSum('commission', $where); $data['data']['total_commission'] = $this->m_bargain->getBargainListSum('commission', $where);
$where['b.create_time'] = $where['a.create_time'];
unset($where['a.create_time']);
$data['data']['total_income_money'] = $m_real->getIncomeListSum('money', $where); $data['data']['total_income_money'] = $m_real->getIncomeListSum('money', $where);
} else { } else {
$data['data']['total_commission'] = 0; $data['data']['total_commission'] = 0;
......
...@@ -363,7 +363,6 @@ class OBargainModel extends Model ...@@ -363,7 +363,6 @@ class OBargainModel extends Model
->join('g_houses d', 'c.house_id = d.id', 'left') ->join('g_houses d', 'c.house_id = d.id', 'left')
->join('o_partial_commission e', 'e.bargain_id = a.id', 'left') ->join('o_partial_commission e', 'e.bargain_id = a.id', 'left')
->where($params) ->where($params)
->group('a.id')
->order($order_) ->order($order_)
->limit($pageSize) ->limit($pageSize)
->page($pageNo) ->page($pageNo)
...@@ -381,8 +380,8 @@ class OBargainModel extends Model ...@@ -381,8 +380,8 @@ class OBargainModel extends Model
->join('o_report b', 'a.report_id = b.id', 'left') ->join('o_report b', 'a.report_id = b.id', 'left')
->join('o_order c', 'a.order_id = c.id', 'left') ->join('o_order c', 'a.order_id = c.id', 'left')
->join('g_houses d', 'c.house_id = d.id', 'left') ->join('g_houses d', 'c.house_id = d.id', 'left')
->join('o_partial_commission e', 'e.bargain_id = a.id', 'left')
->where($params) ->where($params)
->group('a.id')
->sum($field); ->sum($field);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment