改一下bug

app/Service/StatisticService.php

@@ -1323,21 +1323,30 @@ class StatisticService extends Service
         //查询所有项目人员的工时比例
         //汇总每个人每个月工资
         $salary_map = [];
+        $all_salary = [];
         foreach ($month_employee_salary as $val) {
             $month = $monthly_ps_order_key_list[$val['main_id']] ?? '';
             if ($month) {
                 $salary_map[$val['employee_id'] . '_' . $month] = $val;
+                $all_salary[$val['employee_id'] . '_' . $month] = [
+                    "salary" => $val['salary']*100,
+                    "social_insurance" => $val['social_insurance']*100,
+                    "public_housing_fund" => $val['public_housing_fund']*100,
+                ];
             }
         }
 //        var_dump($salary_map);die;
         // 2. 计算每个员工在每个月的全月总工时
         $employee_monthly_total_min = [];
+        $all_min = [];
         foreach ($month_employee_list as $row) {
             $key = $row['employee_id'] . '_' . $row['order_month'];
             if (!isset($employee_monthly_total_min[$key])) {
                 $employee_monthly_total_min[$key] = 0;
+                $all_min[$key] = 0;
             }
             $employee_monthly_total_min[$key] += $row['total_work'];
+            $all_min[$key] = round($row['total_work']/60,2)*100;
         }
 
         // 3. 计算分摊天数与工资
@@ -1351,9 +1360,9 @@ class StatisticService extends Service
                     "allocated_salary" => 0,
                     "employee_id" => $item['employee_id'],
                     "work_minutes" => 0,
-                    "salary" => $salary_map[$key]['salary'] ?? 0,
-                    "social_insurance" => $salary_map[$key]['social_insurance'] ?? 0,
-                    "public_housing_fund" => $salary_map[$key]['public_housing_fund'] ?? 0,
+                    "salary" => ($salary_map[$key]['salary'] ?? 0),
+                    "social_insurance" => ($salary_map[$key]['social_insurance'] ?? 0),
+                    "public_housing_fund" => ($salary_map[$key]['public_housing_fund'] ?? 0),
                     "item_id" => $item['item_id'],
                 ];
             }
@@ -1382,17 +1391,48 @@ class StatisticService extends Service
         $item = Item::TopClear($user, $data);
         $item_title_key_list = $item->wherein('id', $items)->pluck("title", "id")->toArray();
         $item_code_key_list = $item->wherein('id', $items)->pluck("code", "id")->toArray();
+
+        $collect = collect($item_month_list);
+        $employee_count = $collect->groupBy(function ($item) {
+            // 这里的 $item 是集合中的每一行数据
+            return $item['employee_id'] . '_' . $item['month'];
+        })->map(function ($group) {
+            return $group->count();
+        })->toArray();
+
+
         //项目编码、项目名称、姓名、人员类别、应出勤工时、研发出勤工时、研发工时占比、归集工资总额、归集社保金额、归集公积金、研发工资总额、研发社保金额、研发公积金
-        $item_month_list = collect($item_month_list)->transform(function ($item) use ($item_title_key_list, $item_code_key_list, $employee_key_list) {
+        $item_month_list = collect($item_month_list)->transform(function ($item) use ($item_title_key_list, $item_code_key_list, $employee_key_list,&$employee_count,&$all_salary,&$all_min) {
             $item['item_title'] = $item_title_key_list[$item['item_id']] ?? "未知项目({$item['item_id']})";
             $item['item_code'] = $item_code_key_list[$item['item_id']] ?? "未知项目({$item['item_id']})";
             $item['employee_title'] = $employee_key_list[$item['employee_id']]['title'] ?? "未知人员({$item['employee_id']})";
             $item['major'] = $employee_key_list[$item['employee_id']]['major'] ?? "未知人员({$item['employee_id']})";
             $item['total_min'] = round($item['total_min'] / 60, 2);
-            $item['work_minutes'] = round($item['work_minutes'] / 60, 2);
-            $item['work_salary'] = round($item['salary'] * $item['radio'], 2);
-            $item['work_social_insurance'] = round($item['social_insurance'] * $item['radio'], 2);
-            $item['work_public_housing_fund'] = round($item['public_housing_fund'] * $item['radio'], 2);
+            $key = $item['employee_id'] . '_' . $item['month'];
+            if (--$employee_count[$key] > 0) {
+                $work_minutes =  round($item['work_minutes'] / 60, 2);
+                $item['work_minutes'] = $work_minutes;
+                $all_min[$key] -= ($work_minutes*100);
+
+                $work_salary = round($item['salary'] * $item['radio'], 2);
+                $all_salary[$key]['salary'] -= ($work_salary*100);
+                $item['work_salary'] = $work_salary;
+
+                $social_insurance = round($item['social_insurance'] * $item['radio'], 2);
+                $all_salary[$key]['social_insurance'] -= ($social_insurance*100);
+                $item['work_social_insurance'] = $social_insurance;
+
+                $work_public_housing_fund = round($item['public_housing_fund'] * $item['radio'], 2);
+                $all_salary[$key]['public_housing_fund'] -= ($work_public_housing_fund*100);
+                $item['work_public_housing_fund'] = $work_public_housing_fund;
+
+            } else {
+                $item['work_salary'] = round($all_salary[$key]['salary']/100,2);
+                $item['work_social_insurance'] = round($all_salary[$key]['social_insurance'] /100,2);
+                $item['work_public_housing_fund'] = round( $all_salary[$key]['public_housing_fund']/100,2);
+                $item['work_minutes'] = round( $all_min[$key]/100,2);
+            }
+
             return $item;
         })->all();
         return [true, $item_month_list];