Commit f9643e49 authored by zhuwei's avatar zhuwei

1

parent 86592d93
...@@ -66,9 +66,8 @@ class CostParameter extends Basic ...@@ -66,9 +66,8 @@ class CostParameter extends Basic
if (!empty($params['store_id'])) { if (!empty($params['store_id'])) {
$conditions["a.id"] = $params["store_id"]; $conditions["a.id"] = $params["store_id"];
} }
$conditions["c.setting_date"] = $params['setting_date']; // $conditions["c.setting_date"] = $params['setting_date'];
big_log($conditions);
$field = 'a.id,a.store_name,b.office_name,d.name,d.phone,c.is_discounts, $field = 'a.id,a.store_name,b.office_name,d.name,d.phone,c.is_discounts,
c.transfer_charge,c.social_security_fee,c.attendance_num,c.official_receipts, c.transfer_charge,c.social_security_fee,c.attendance_num,c.official_receipts,
c.last_official_receipts,c.deduct'; c.last_official_receipts,c.deduct';
......
...@@ -386,6 +386,7 @@ class AStore extends BaseModel ...@@ -386,6 +386,7 @@ class AStore extends BaseModel
->join('f_store_data c', 'a.id = c.store_id', 'left') ->join('f_store_data c', 'a.id = c.store_id', 'left')
->join('a_agents d', 'a.id = d.store_id and (level = 20 or level = 40) ', 'left') ->join('a_agents d', 'a.id = d.store_id and (level = 20 or level = 40) ', 'left')
->where($params) ->where($params)
->group('c.store_id')
->limit($pageSize) ->limit($pageSize)
->page($pageNo) ->page($pageNo)
->select(); ->select();
...@@ -400,7 +401,10 @@ class AStore extends BaseModel ...@@ -400,7 +401,10 @@ class AStore extends BaseModel
->alias('a') ->alias('a')
->join('f_office b', 'a.office_id = b.id', 'left') ->join('f_office b', 'a.office_id = b.id', 'left')
->join('f_store_data c', 'a.id = c.store_id', 'left') ->join('f_store_data c', 'a.id = c.store_id', 'left')
->join('a_agents d', 'a.id = d.store_id and (level = 20 or level = 40) ', 'left')
->where($params) ->where($params)
->group('c.store_id')
->count(); ->count();
return $result; return $result;
} }
......
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