cqp 5 дней назад
Родитель
Сommit
22ce0ec2a7
1 измененных файлов с 71 добавлено и 40 удалено
  1. 71 40
      app/Service/StatisticService.php

+ 71 - 40
app/Service/StatisticService.php

@@ -953,13 +953,17 @@ class StatisticService extends StatisticCommonService
     {
         list($status, $month_start, $month_end) = $this->commonRule($data);
         if (!$status) return [false, $month_start];
-        //项目编码、项目名称、姓名、人员类别、应出勤工时、研发出勤工时、研发工时占比、归集工资总额、归集社保金额、归集公积金、研发工资总额、研发社保金额、研发公积金
-        //获取人员工资项目相关分组数据
-        //确认所有项目、人员、人员工时
+
+        // 获取人员工资项目相关分组数据
         $month_employee_list = $this->getItemEmployeeMonthWorkList($user, $data, $month_start, $month_end);
-        //查询所有人员工资
-        $monthly_ps_order_ids = MonthlyPsOrder::Clear($user, $data)->where('del_time', 0)->where("month", ">=", $month_start)->where("month", "<", $month_end)
+
+        // 查询所有人员工资
+        $monthly_ps_order_ids = MonthlyPsOrder::Clear($user, $data)
+            ->where('del_time', 0)
+            ->where("month", ">=", $month_start)
+            ->where("month", "<", $month_end)
             ->pluck('id')->toArray();
+
         $monthly_ps_order_key_list = MonthlyPsOrder::Clear($user, $data)
             ->where('del_time', 0)
             ->where("month", ">=", $month_start)
@@ -967,24 +971,27 @@ class StatisticService extends StatisticCommonService
             ->select('id', DB::raw("FROM_UNIXTIME(month, '%Y-%m') as month_str"))
             ->pluck('month_str', 'id')
             ->toArray();
+
         $month_employee_salary = MonthlyPsOrderDetails::wherein('main_id', $monthly_ps_order_ids)
             ->select("employee_id", DB::raw("(base_salary + performance_salary + bonus + other) as salary"), "main_id", "social_insurance", "public_housing_fund")
             ->get()->toArray();
-        //查询所有项目人员的工时比例
-        //汇总每个人每个月工资
+
+        // 1. 汇总每个人每个月工资
         $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,
+                $key = $val['employee_id'] . '_' . $month;
+                $salary_map[$key] = $val;
+                $all_salary[$key] = [
+                    "salary" => (float)$val['salary'] * 100,
+                    "social_insurance" => (float)$val['social_insurance'] * 100,
+                    "public_housing_fund" => (float)$val['public_housing_fund'] * 100,
                 ];
             }
         }
+
         // 2. 计算每个员工在每个月的全月总工时
         $employee_monthly_total_min = [];
         $all_min = [];
@@ -994,8 +1001,17 @@ class StatisticService extends StatisticCommonService
                 $employee_monthly_total_min[$key] = 0;
                 $all_min[$key] = 0;
             }
+            // 如果此员工该月无工资记录,初始化默认全 0 结构,防止报错
+            if (!isset($all_salary[$key])) {
+                $all_salary[$key] = [
+                    "salary" => 0,
+                    "social_insurance" => 0,
+                    "public_housing_fund" => 0,
+                ];
+            }
+
             $employee_monthly_total_min[$key] += $row['total_work'];
-            $all_min[$key] += round($row['total_work']/60,2)*100;
+            $all_min[$key] += round($row['total_work'] / 60, 2) * 100;
         }
 
         // 3. 计算分摊天数与工资
@@ -1003,6 +1019,7 @@ class StatisticService extends StatisticCommonService
         foreach ($month_employee_list as $item) {
             $key = $item['employee_id'] . '_' . $item['order_month'];
             $item_key = $item['order_month'] . '_' . $item['item_id'] . '_' . $item['employee_id'];
+
             if (!isset($item_month_list[$item_key])) {
                 $item_month_list[$item_key] = [
                     "month" => $item['order_month'],
@@ -1015,73 +1032,87 @@ class StatisticService extends StatisticCommonService
                     "item_id" => $item['item_id'],
                 ];
             }
+
             $total_min = $employee_monthly_total_min[$key] ?? 0;
-            // B. 计算工资分摊:(项目工时 / 月总工时) * 月工资
+            // 计算工资分摊比例
             if ($total_min > 0) {
-                $ratio = round((round($item['total_work']/60,2) / round($total_min/60,2)), 4);
+                $ratio = round((round($item['total_work'] / 60, 2) / round($total_min / 60, 2)), 4);
             } else {
                 $ratio = 0;
             }
+
             $item_month_list[$item_key]['radio'] = $ratio;
             $item_month_list[$item_key]['total_min'] = $total_min;
             $item_month_list[$item_key]['work_minutes'] += $item['total_work'];
         }
+
         $item_month_list = collect($item_month_list)->sortBy('month')->values()->all();
         $items = collect($item_month_list)->pluck('item_id')->unique()->values()->all();
         $employee_ids = collect($item_month_list)->pluck('employee_id')->unique()->values()->all();
-        $employee = Employee::TopClear($user, $data);
-        $employee_list = $employee->wherein('id', $employee_ids)->select("major", "title", "id")->get()->toArray();
-        $employee_key_list = [];
-        foreach ($employee_list as $v) {
-            $employee_key_list[$v['id']] = $v;
-        }
-        $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();
+
+        $employee_list = Employee::TopClear($user, $data)
+            ->wherein('id', $employee_ids)
+            ->select("major", "title", "id")
+            ->get()
+            ->keyBy('id')
+            ->toArray();
+
+        $item_query = Item::TopClear($user, $data)->wherein('id', $items);
+        $item_title_key_list = (clone $item_query)->pluck("title", "id")->toArray();
+        $item_code_key_list = (clone $item_query)->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,&$employee_count,&$all_salary,&$all_min) {
+        // 组装最终结果
+        $item_month_list = collect($item_month_list)->transform(function ($item) use ($item_title_key_list, $item_code_key_list, $employee_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['employee_title'] = $employee_list[$item['employee_id']]['title'] ?? "未知人员({$item['employee_id']})";
+            $item['major'] = $employee_list[$item['employee_id']]['major'] ?? "未知人员({$item['employee_id']})";
             $item['total_min'] = round($item['total_min'] / 60, 2);
+
             $key = $item['employee_id'] . '_' . $item['month'];
+
+            // 容错处理:确保 $all_salary[$key] 和 $all_min[$key] 一定存在
+            if (!isset($all_salary[$key])) {
+                $all_salary[$key] = ['salary' => 0, 'social_insurance' => 0, 'public_housing_fund' => 0];
+            }
+            if (!isset($all_min[$key])) {
+                $all_min[$key] = 0;
+            }
+
             if (--$employee_count[$key] > 0) {
-                $work_minutes =  round($item['work_minutes'] / 60, 2);
+                $work_minutes = round($item['work_minutes'] / 60, 2);
                 $item['work_minutes'] = $work_minutes;
-                $all_min[$key] -= ($work_minutes*100);
+                $all_min[$key] -= ($work_minutes * 100);
 
                 $work_salary = round($item['salary'] * $item['radio'], 2);
-                $all_salary[$key]['salary'] -= ($work_salary*100);
+                $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);
+                $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);
+                $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);
+                // 最后一笔记录通过反扣差额尾差,保证总和 100% 精确对齐
+                $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];
     }