city_name

application/index/controller/Cost.php

@@ -60,14 +60,22 @@ class Cost extends Basic
                 3=>'二审通过',
                 4=>'三审通过',
             ];
+
+            $redis = new RedisCacheService();
             foreach ($list as $k=>$v) {
+                $type_name = $cost_service->getFeeType($v['type']);
+                if ($v['type'] == 3) {
+                    $city_name = $redis->getRedisCache(4, $v['site_id']);
+                    $type_name .= '-'.$city_name;
+                }
+
                 $excel_data[$k] = [
                     'id'=>$v['id'],
                     'count_time'=>$v['count_time'],
                     'create_time'=>$v['create_time'],
                     'agent_name'=>$v['agent_name'],
                     'total_fee'=>$v['total_fee'],
-                    'type_name'=>$cost_service->getFeeType($v['type']),
+                    'type_name'=>$type_name,
                     'fee_item_name'=>$cost_service->getFeeItem($v['fee_item']),
                     'purpose'=>$v['purpose'],
                     'source_name' => $source[$v['source']],

application/index/service/CostService.php

@@ -109,6 +109,7 @@ class CostService
             201=>'总部固定成本',
             202=>'总部其他成本',
             301=>'分部固定成本',
+            302=>'分部其它成本',
             401=>'同联发展基金',
             501=>'家庭基金报销',
             502=>'社保报销',