Commit 86592d93 authored by hujun's avatar hujun

excel

parent f5eec4ad
...@@ -64,9 +64,10 @@ class Cost extends Basic ...@@ -64,9 +64,10 @@ class Cost extends Basic
$redis = new RedisCacheService(); $redis = new RedisCacheService();
foreach ($list as $k=>$v) { foreach ($list as $k=>$v) {
$type_name = $cost_service->getFeeType($v['type']); $type_name = $cost_service->getFeeType($v['type']);
$fee_item_name = $cost_service->getFeeItem($v['fee_item']);
if ($v['type'] == 3) { if ($v['type'] == 3) {
$city_name = $redis->getRedisCache(4, $v['site_id']); $city_name = $redis->getRedisCache(4, $v['site_id']);
$type_name .= '-'.$city_name; $type_name = $city_name.'-'.$type_name;
} }
$excel_data[$k] = [ $excel_data[$k] = [
...@@ -76,7 +77,7 @@ class Cost extends Basic ...@@ -76,7 +77,7 @@ class Cost extends Basic
'agent_name'=>$v['agent_name'], 'agent_name'=>$v['agent_name'],
'total_fee'=>$v['total_fee'], 'total_fee'=>$v['total_fee'],
'type_name'=>$type_name, 'type_name'=>$type_name,
'fee_item_name'=>$cost_service->getFeeItem($v['fee_item']), 'fee_item_name'=>$fee_item_name,
'purpose'=>$v['purpose'], 'purpose'=>$v['purpose'],
'source_name' => $source[$v['source']], 'source_name' => $source[$v['source']],
'status'=>$status[$v['status']] 'status'=>$status[$v['status']]
......
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