|
|
@@ -139,7 +139,7 @@ class OvertimeVerification extends Api
|
|
|
|
|
|
$arr = array_merge($arr, $r);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
$list = [];
|
|
|
foreach($arr as $v){
|
|
|
if(isset($list[$v['wgjs_bh'].'-'.$v['wgjs_rq']])){
|
|
|
@@ -160,7 +160,7 @@ class OvertimeVerification extends Api
|
|
|
$v['当月定额'] = round($v['当月定额']);
|
|
|
$v['月度合计产量'] = round($v['月度合计产量']);
|
|
|
$v['月计时时数'] = floatval(number_format($v['月计时时数'],2));
|
|
|
- $v['计时补差'] = floatval(number_format($v['月计时时数']*9.5,2));
|
|
|
+ $v['计时补差'] = floatval(bcmul($v['月计时时数'], 9.5, 2));
|
|
|
unset($v['rq_bh']);
|
|
|
}
|
|
|
$res = array_values($res);
|