Commit f5e9991f authored by zhuwei's avatar zhuwei

1

parent 8c142cdc
...@@ -49,7 +49,7 @@ class CostDetail extends Basic ...@@ -49,7 +49,7 @@ class CostDetail extends Basic
$conditions=$this->buildConditions($params); $conditions=$this->buildConditions($params);
$field = 'a.id,a.cost_id,b.setting_date,a.create_time,b.operator_name, $field = 'a.id,a.cost_id,b.setting_date,a.create_time,b.operator_name,
a.type,a.fee_item,a.purpose,c.store_id,a.assume_fee'; a.type,a.fee_item,a.purpose,b.store_id,a.assume_fee';
$list = $this->storeCostExt->getStoreCostExt($field, $conditions, $pageNo, $pageSize); $list = $this->storeCostExt->getStoreCostExt($field, $conditions, $pageNo, $pageSize);
if(!$list) if(!$list)
...@@ -80,7 +80,7 @@ class CostDetail extends Basic ...@@ -80,7 +80,7 @@ class CostDetail extends Basic
$conditions=$this->buildConditions($params); $conditions=$this->buildConditions($params);
$field = 'a.id,a.cost_id,b.setting_date,a.create_time,b.operator_name, $field = 'a.id,a.cost_id,b.setting_date,a.create_time,b.operator_name,
a.type,a.fee_item,a.purpose,c.store_id,a.assume_fee'; a.type,a.fee_item,a.purpose,b.store_id,a.assume_fee';
$list = $this->storeCostExt->getStoreCostExtExcel($field, $conditions); $list = $this->storeCostExt->getStoreCostExtExcel($field, $conditions);
if(!$list) if(!$list)
......
...@@ -44,7 +44,6 @@ class FStoreCostExt extends BaseModel ...@@ -44,7 +44,6 @@ class FStoreCostExt extends BaseModel
->alias('a') ->alias('a')
->join('f_store_cost b', 'a.cost_id = b.id', 'left') ->join('f_store_cost b', 'a.cost_id = b.id', 'left')
->join('f_apply_for_fee c', 'a.apply_for_id = c.id', 'left') ->join('f_apply_for_fee c', 'a.apply_for_id = c.id', 'left')
->where($params) ->where($params)
->limit($pageSize) ->limit($pageSize)
->page($pageNo) ->page($pageNo)
......
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