|
|
@@ -119,6 +119,7 @@ class StatisticsService extends Service
|
|
|
$employee[$key]['set_total_hours'] = $set_total_hours;
|
|
|
//汇总研发工时单里的总工时
|
|
|
$rd_total_hours = $employee_map[$value['id']] ?? 0;
|
|
|
+ $rd_total_hours = bcdiv($rd_total_hours,60,2);
|
|
|
$employee[$key]['rd_total_hours'] = $rd_total_hours;
|
|
|
//每个项目的工时
|
|
|
$every_item_hours = $employee_map_2[$value['id']] ?? [];
|
|
|
@@ -254,6 +255,7 @@ class StatisticsService extends Service
|
|
|
$device[$key]['set_total_hours'] = $set_total_hours;
|
|
|
//汇总研发工时单里的总工时
|
|
|
$rd_total_hours = $device_map[$value['id']] ?? 0;
|
|
|
+ $rd_total_hours = bcdiv($rd_total_hours,60,2);
|
|
|
$device[$key]['rd_total_hours'] = $rd_total_hours;
|
|
|
//每个项目的工时
|
|
|
$every_item_hours = $device_map_2[$value['id']] ?? [];
|