Commit d67c301c authored by zhuwei's avatar zhuwei

1

parent 0d112ac3
...@@ -48,9 +48,8 @@ class CostDetail extends Basic ...@@ -48,9 +48,8 @@ class CostDetail extends Basic
$pageSize = empty($params['pageSize']) ? 15 : $params['pageSize']; $pageSize = empty($params['pageSize']) ? 15 : $params['pageSize'];
$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,a.store_id,a.assume_fee'; a.type,a.fee_item,a.purpose,a.store_id,a.assume_fee,a.apply_for_id';
$list = $this->storeCostExt->getStoreCostExt($field, $conditions, $pageNo, $pageSize); $list = $this->storeCostExt->getStoreCostExt($field, $conditions, $pageNo, $pageSize);
if(!$list) if(!$list)
...@@ -121,7 +120,7 @@ class CostDetail extends Basic ...@@ -121,7 +120,7 @@ class CostDetail extends Basic
} }
//创建时间 //创建时间
if (!empty($params['start_time']) && !empty($params['end_time'])) { if (!empty($params['start_time']) && !empty($params['end_time'])) {
$where['a.create_time'] = ['between', [$params['start_time'] . ' 00:00:00', $params['end_time'] . ' 23:59:59']]; $conditions['a.create_time'] = ['between', [$params['start_time'] . ' 00:00:00', $params['end_time'] . ' 23:59:59']];
} }
//门店id //门店id
if (!empty($params['store_id'])) { if (!empty($params['store_id'])) {
...@@ -132,8 +131,8 @@ class CostDetail extends Basic ...@@ -132,8 +131,8 @@ class CostDetail extends Basic
$conditions["a.id"] = $params["id"]; $conditions["a.id"] = $params["id"];
} }
//费用ID //费用ID
if (!empty($params['cost_id'])) { if (!empty($params['apply_for_id'])) {
$conditions["b.cost_id"] = $params["cost_id"]; $conditions["a.apply_for_id"] = $params["apply_for_id"];
} }
//费用类型 //费用类型
if (!empty($params['type'])) { if (!empty($params['type'])) {
......
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