|
|
@@ -500,8 +500,8 @@ class GluSalaryCalculationService
|
|
|
|
|
|
$duration = isset($row['wgjs_js' . $i]) ? (float)$row['wgjs_js' . $i] : 0;
|
|
|
$type = isset($row['wgjs_yy' . $i]) ? trim($row['wgjs_yy' . $i]) : '';
|
|
|
- $salary = isset($row['wgjs_je' . $i]) ? (float)$row['wgjs_je' . $i] : 0;
|
|
|
- $price = '';
|
|
|
+ $price = isset($row['wgjs_je' . $i]) ? (float)$row['wgjs_je' . $i] : 0;
|
|
|
+ $salary = floatval(number_format($duration * $price, 2, '.', ''));
|
|
|
$name = $employeeNames[$bh] ?? '';
|
|
|
$key = $ymd . '-' . $bh . '-' . $name . '-' . $price;
|
|
|
|
|
|
@@ -518,11 +518,11 @@ class GluSalaryCalculationService
|
|
|
'sczl_rq' => $sczl_rq,
|
|
|
'type' => $type,
|
|
|
'duration' => floatval(number_format($duration, 2, '.', '')),
|
|
|
- 'price' => '',
|
|
|
+ 'price' => $price,
|
|
|
'remark' => '',
|
|
|
'bh' => $bh,
|
|
|
'姓名' => $name,
|
|
|
- 'salary' => floatval(number_format($salary, 2, '.', '')),
|
|
|
+ 'salary' => $salary,
|
|
|
];
|
|
|
}
|
|
|
}
|
