优先级

app/Service/ExportFileService.php

@@ -12,7 +12,9 @@ use App\Exports\ProjectStaffExport;
 use App\Exports\ResearchExpenseMultipleSheetExport;
 use App\Model\Depart;
 use App\Model\Employee;
+use App\Model\Fee;
 use App\Model\PLeaveOverOrder;
+use Illuminate\Support\Carbon;
 use Maatwebsite\Excel\Facades\Excel;
 
 class ExportFileService extends Service
@@ -824,9 +826,8 @@ class ExportFileService extends Service
                 // 填充到动态科目列
                 $rowValues[] = $amount;
 
-                // --- 费用归集逻辑修正 ---
                 // 1. 累加其他相关费用合计 (7.1)
-                $val7_1 += $amount;
+                if(! empty($feeData['is_other']) && $feeData['is_other'] == Fee::IS_OTHER_ONE) $val7_1 += $amount;
 
                 // 2. 累加委托费用 (8.1 和 8.3)
                 $val8_1 += (float)($feeData['entrust1_amount'] ?? 0);
@@ -839,15 +840,16 @@ class ExportFileService extends Service
                 'status' => (($v['state'] ?? '') == "完结" ? 3 : 2),
                 'type'   => $v['expense_type'] ?? '费用化支出',
                 'values' => $rowValues,
-                'val7_1' => $val7_1, // 修正：此处为 total_amount 累加之和
-                'val8_1' => $val8_1, // 修正：此处为 entrust1_amount 累加之和
-                'val8_3' => $val8_3, // 修正：此处为 entrust2_amount 累加之和
+                'val7_1' => $val7_1,
+                'val8_1' => $val8_1,
+                'val8_3' => $val8_3,
             ];
         }
 
         // 年份获取逻辑
-        $timeSource = $data['month_start'] ?? ($data['month_end'] ?? 'now');
-        $year = is_numeric($timeSource) ? date('Y', $timeSource) : date('Y', strtotime($timeSource));
+        $year = Carbon::parse($data['year'])
+            ->setTimezone(config('app.timezone')) // 转换为 Laravel 配置的时区
+            ->format('Y');
 
         // 3. 组织多 Sheet 格式数据
         $monthsData = [