封装的报表类方法

app/Service/StatisticService.php

@@ -312,7 +312,7 @@ class StatisticService extends StatisticCommonService
         $item_device_list = $this->getDeviceItemSalary($month_start, $month_end, $data, $user);
         //第四步其他费用
         list($item_fee_list, $fee_type_list) = $this->getFeeItemSalary($month_start, $month_end, $data, $user);
-
+//        dd($item_device_list);
         //组合所有数据
         $return = [];
         foreach ($item_key_list as $v) {
@@ -323,7 +323,7 @@ class StatisticService extends StatisticCommonService
                 "title" => $v['title'],
                 "state" => $v['state'] == 3 ? "完结" : "进行中",
                 "employee_salary" => isset($item_employee_list[$v['id']]['salary']) ?  round($item_employee_list[$v['id']]['salary'],2) : 0,
-                "device_depreciation" => isset($item_device_list[$v['id']]['depreciation']) ? round($item_device_list[$v['id']]['depreciation'],2): 0,
+                "device_depreciation" => isset($item_device_list[$v['id']]['allocated_depreciation']) ? round($item_device_list[$v['id']]['allocated_depreciation'],2): 0,
                 "expense_type" => "费用化支出",
                 "fee_list" => collect($item_fee_list[$v['id']] ?? [])->values()->all(),
             ];