|
@@ -1133,7 +1133,8 @@ class StatisticService extends StatisticCommonService
|
|
|
$childToRoot[$type['id']] = [
|
|
$childToRoot[$type['id']] = [
|
|
|
'id' => $current['id'],
|
|
'id' => $current['id'],
|
|
|
'title' => $current['title'],
|
|
'title' => $current['title'],
|
|
|
- 'sort' => $current['sort']
|
|
|
|
|
|
|
+ 'sort' => $current['sort'],
|
|
|
|
|
+ 'is_other' => $type['is_other']
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1145,6 +1146,7 @@ class StatisticService extends StatisticCommonService
|
|
|
// 获取该费用对应的一级分类信息
|
|
// 获取该费用对应的一级分类信息
|
|
|
if (!isset($childToRoot[$feeId])) continue;
|
|
if (!isset($childToRoot[$feeId])) continue;
|
|
|
$rootId = $childToRoot[$feeId]['id'];
|
|
$rootId = $childToRoot[$feeId]['id'];
|
|
|
|
|
+ $is_other = $childToRoot[$feeId]['is_other'];
|
|
|
$title = $childToRoot[$feeId]['title'];
|
|
$title = $childToRoot[$feeId]['title'];
|
|
|
$sort = $childToRoot[$feeId]['sort'];
|
|
$sort = $childToRoot[$feeId]['sort'];
|
|
|
$key = $item['item_id'];
|
|
$key = $item['item_id'];
|
|
@@ -1155,7 +1157,7 @@ class StatisticService extends StatisticCommonService
|
|
|
'total_amount' => 0,
|
|
'total_amount' => 0,
|
|
|
'entrust1_amount' => 0, //委内
|
|
'entrust1_amount' => 0, //委内
|
|
|
'entrust2_amount' => 0, //委外
|
|
'entrust2_amount' => 0, //委外
|
|
|
-
|
|
|
|
|
|
|
+ 'is_other' => $is_other //是否其他费用
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
|
if ($item['entrust_type'] == 1) {
|
|
if ($item['entrust_type'] == 1) {
|
