微信小程序

app/Service/StatisticService.php

@@ -1124,7 +1124,7 @@ 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);
 
         // 1. 查询所有人员工资单
@@ -1146,7 +1146,7 @@ class StatisticService extends StatisticCommonService
             ->select("employee_id", DB::raw("(base_salary + performance_salary + bonus + other) as salary"), "main_id", "social_insurance", "public_housing_fund")
             ->get()->toArray();
 
-        // 2. 查询所有人员月度工时单 (新增逻辑)
+        // 2. 查询所有人员月度工时单 (作为分摊分母)
         $monthly_pw_order_key_list = MonthlyPwOrder::Clear($user, $data)
             ->where('del_time', 0)
             ->where("month", ">=", $month_start)
@@ -1157,7 +1157,7 @@ class StatisticService extends StatisticCommonService
 
         $monthly_pw_order_ids = array_keys($monthly_pw_order_key_list);
 
-        $month_employee_pw = MonthlyPwOrderDetails::whereIn('main_id', $monthly_pw_order_ids)
+        $month_employee_pw = MonthlyPwOrderDetails::wherein('main_id', $monthly_pw_order_ids)
             ->where('del_time', 0)
             ->select('employee_id', 'main_id', 'total_hours')
             ->get()->toArray();
@@ -1187,20 +1187,16 @@ class StatisticService extends StatisticCommonService
             }
         }
 
-        // 4. 获取每个员工在每个月的全月总工时（改自月度工时单）
+        // 4. 获取每个员工在每个月的全月总工时（来自月工时单，用作分母）
         $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])) {
-                // 直接从工时单映射中获取小时数，乘以 60 转为分钟供后续比例计算
                 $total_hours = $pw_hours_map[$key] ?? 0;
-                $employee_monthly_total_min[$key] = $total_hours * 60;
-                $all_min[$key] = round($total_hours * 100, 2); // 放大100倍用于尾差倒扣
+                $employee_monthly_total_min[$key] = $total_hours * 60; // 转换为分钟用于计算比例
             }
 
-            // 如果此员工该月无工资记录，初始化默认全 0 结构，防止报错
             if (!isset($all_salary[$key])) {
                 $all_salary[$key] = [
                     "salary" => 0,
@@ -1210,7 +1206,7 @@ class StatisticService extends StatisticCommonService
             }
         }
 
-        // 5. 计算分摊天数与工资
+        // 5. 计算分摊比例与数据组装
         $item_month_list = [];
         foreach ($month_employee_list as $item) {
             $key = $item['employee_id'] . '_' . $item['order_month'];
@@ -1230,7 +1226,7 @@ class StatisticService extends StatisticCommonService
             }
 
             $total_min = $employee_monthly_total_min[$key] ?? 0;
-            // 计算工资分摊比例（项目实际工作分钟数 / 工时单月度总分钟数）
+            // 计算工资分摊比例（项目实际工作分钟数 / 月度工时单总分钟数）
             if ($total_min > 0) {
                 $ratio = round($item['total_work'] / $total_min, 4);
             } else {
@@ -1239,7 +1235,7 @@ class StatisticService extends StatisticCommonService
 
             $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[$item_key]['work_minutes'] += $item['total_work']; // 累加项目实际分钟数
         }
 
         $item_month_list = collect($item_month_list)->sortBy('month')->values()->all();
@@ -1265,28 +1261,26 @@ class StatisticService extends StatisticCommonService
         })->toArray();
 
         // 6. 组装最终结果
-        $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_month_list = collect($item_month_list)->transform(function ($item) use ($item_title_key_list, $item_code_key_list, $employee_list, &$employee_count, &$all_salary) {
             $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_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);
 
+            // 项目实际工时（小时）：直接按实际汇总分钟数转为小时，真实反映该项目工时
+            $item['work_minutes'] = round($item['work_minutes'] / 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);
-                $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;
@@ -1299,11 +1293,10 @@ class StatisticService extends StatisticCommonService
                 $all_salary[$key]['public_housing_fund'] -= ($work_public_housing_fund * 100);
                 $item['work_public_housing_fund'] = $work_public_housing_fund;
             } else {
-                // 最后一笔记录通过反扣差额尾差，保证总和 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;