up

app/Http/Controllers/Admin/StatisticsController.php

@@ -167,6 +167,7 @@ class StatisticsController extends CommonController
 
         $start_timestamp = strtotime($month);
         $end_timestamp = strtotime("+1 month", strtotime($month));
+
         //根据项目获取相关数据
         $prev_month_balance = Balance::whereRaw("UNIX_TIMESTAMP(`created_at`) < " . $start_timestamp)
             ->whereHas("order", function ($query) use ($project_id) {

resources/views/admin/statistics/salary.blade.php

@@ -105,7 +105,7 @@
                                 <td class="p-1">{{ $item->order ? $item->order->contact."/".$item->order->mobile : "" }}</td>
                                 <td class="p-1">{{ $item->building->name }}</td>
                                 <td class="p-1">{{ $item->area->name }}</td>
-                                <td class="p-1">{{ ($item->room ? $item->room->name : "")."-".$item->bed->name }}</td>
+                                <td class="p-1">{{ ($item->room ? $item->room->name : "")."_".$item->bed->name }}</td>
                                 <td class="p-1">{!! implode("<br>",$item->factor_texts) !!}</td>
                                 <td class="p-1">{{ $item->total }}</td>
                                 <td class="p-1">{{ $item->paramedic_total }}</td>