cqp 1 月之前
父節點
當前提交
a43f9f0557
共有 1 個文件被更改,包括 2 次插入3 次删除
  1. 2 3
      app/Service/ExportFileService.php

+ 2 - 3
app/Service/ExportFileService.php

@@ -653,7 +653,7 @@ class ExportFileService extends Service
             foreach ($groupedByEmployee as $employeeId => $records) {
             foreach ($groupedByEmployee as $employeeId => $records) {
                 $first = $records->first();
                 $first = $records->first();
                 $empMonthSalary = (float)$first['total_salary'];
                 $empMonthSalary = (float)$first['total_salary'];
-                $empTotalHours = round((float)$first['total_min'] / 60, 2); // 月总工时(小时)
+                $empTotalHours = $first['total_hours'];
 
 
                 // 1-4列:序号、姓名、工资、月总工时
                 // 1-4列:序号、姓名、工资、月总工时
                 $row = [$index++, $first['employee_title'], $empMonthSalary, $empTotalHours];
                 $row = [$index++, $first['employee_title'], $empMonthSalary, $empTotalHours];
@@ -664,8 +664,7 @@ class ExportFileService extends Service
                 foreach ($monthProjects as $code) {
                 foreach ($monthProjects as $code) {
                     if ($empMap->has($code)) {
                     if ($empMap->has($code)) {
                         $record = $empMap->get($code);
                         $record = $empMap->get($code);
-                        // 优先取 days 字段,如果没有则取 work_hours 除以 8
-                        $days = isset($record['days']) ? (float)$record['days'] : round((float)($record['work_hours'] ?? 0) / 8, 2);
+                        $days = (float)($record['work_hours'] ?? 0);
                     } else {
                     } else {
                         $days = 0;
                         $days = 0;
                     }
                     }