cqp há 1 mês atrás
pai
commit
a75d0d4aeb
1 ficheiros alterados com 7 adições e 1 exclusões
  1. 7 1
      app/Service/ExportFileService.php

+ 7 - 1
app/Service/ExportFileService.php

@@ -662,7 +662,13 @@ class ExportFileService extends Service
                 $empMap = $records->keyBy('item_code');
                 $rowProjectDaysSum = 0;
                 foreach ($monthProjects as $code) {
-                    $days = $empMap->has($code) ? (float)$empMap->get($code)['days'] : 0;
+                    if ($empMap->has($code)) {
+                        $record = $empMap->get($code);
+                        // 优先取 days 字段,如果没有则取 work_hours 除以 8
+                        $days = isset($record['days']) ? (float)$record['days'] : round((float)($record['work_hours'] ?? 0) / 8, 2);
+                    } else {
+                        $days = 0;
+                    }
                     $row[] = $days > 0 ? $days : '';
                     $rowProjectDaysSum += $days;
                     $colTotals['project_days'][$code] += $days;