|
@@ -126,8 +126,8 @@ class EmployeeDailySalary extends Api
|
|
|
foreach($arr as $v){
|
|
foreach($arr as $v){
|
|
|
if(isset($list[$v['wgjs_bh'].'-'.$v['wgjs_rq']])){
|
|
if(isset($list[$v['wgjs_bh'].'-'.$v['wgjs_rq']])){
|
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时时数']+=$v['wgjs_js'];
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时时数']+=$v['wgjs_js'];
|
|
|
- $list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时工资']=floatval(number_format($list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时时数']*9.5,2, '.', ''));
|
|
|
|
|
- $list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['日工资合计']=floatval(number_format($list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时时数']*9.5,2, '.', ''));
|
|
|
|
|
|
|
+ $list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时工资']=floatval(number_format($list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时时数']*10,2, '.', ''));
|
|
|
|
|
+ $list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['日工资合计']=floatval(number_format($list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时时数']*10,2, '.', ''));
|
|
|
}else{
|
|
}else{
|
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['bh']=$v['wgjs_bh'];
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['bh']=$v['wgjs_bh'];
|
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['员工姓名']=$v['员工姓名'];
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['员工姓名']=$v['员工姓名'];
|
|
@@ -135,8 +135,8 @@ class EmployeeDailySalary extends Api
|
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计件工资']=0;
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计件工资']=0;
|
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['加班工资']=0;
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['加班工资']=0;
|
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时时数']=$v['wgjs_js'];
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时时数']=$v['wgjs_js'];
|
|
|
- $list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时工资']=floatval(number_format($v['wgjs_js']*9.5,2, '.', ''));
|
|
|
|
|
- $list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['日工资合计']=floatval(number_format($v['wgjs_js']*9.5,2, '.', ''));
|
|
|
|
|
|
|
+ $list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时工资']=floatval(number_format($v['wgjs_js']*10,2, '.', ''));
|
|
|
|
|
+ $list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['日工资合计']=floatval(number_format($v['wgjs_js']*10,2, '.', ''));
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
|
|
|
|
@@ -210,7 +210,7 @@ class EmployeeDailySalary extends Api
|
|
|
$v['计时时数'] += $list[$k]['计时时数'];
|
|
$v['计时时数'] += $list[$k]['计时时数'];
|
|
|
unset($list[$k]);
|
|
unset($list[$k]);
|
|
|
}
|
|
}
|
|
|
- $v['计时工资'] = array_key_exists($k,$brr) ? floatval(number_format($v['计时时数']*9.5+$brr[$k],2, '.', '')) : floatval(number_format($v['计时时数']*9.5,2, '.', ''));
|
|
|
|
|
|
|
+ $v['计时工资'] = array_key_exists($k,$brr) ? floatval(number_format($v['计时时数']*10+$brr[$k],2, '.', '')) : floatval(number_format($v['计时时数']*10,2, '.', ''));
|
|
|
$v['日工资合计'] = floatval(number_format($v['计件工资'] + $v['加班工资'] + $v['计时工资'],2, '.', ''));
|
|
$v['日工资合计'] = floatval(number_format($v['计件工资'] + $v['加班工资'] + $v['计时工资'],2, '.', ''));
|
|
|
|
|
|
|
|
unset($v['rq_bh']);
|
|
unset($v['rq_bh']);
|
|
@@ -361,8 +361,8 @@ class EmployeeDailySalary extends Api
|
|
|
foreach($arr as $v){
|
|
foreach($arr as $v){
|
|
|
if(isset($list[$v['wgjs_bh'].'-'.$v['wgjs_rq']])){
|
|
if(isset($list[$v['wgjs_bh'].'-'.$v['wgjs_rq']])){
|
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时时数']+=$v['wgjs_js'];
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时时数']+=$v['wgjs_js'];
|
|
|
- $list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时工资']=floatval(number_format($list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时时数']*9.5,2, '.', ''));
|
|
|
|
|
- $list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['日工资合计']=floatval(number_format($list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时时数']*9.5,2, '.', ''));
|
|
|
|
|
|
|
+ $list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时工资']=floatval(number_format($list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时时数']*10,2, '.', ''));
|
|
|
|
|
+ $list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['日工资合计']=floatval(number_format($list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时时数']*10,2, '.', ''));
|
|
|
}else{
|
|
}else{
|
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['bh']=$v['wgjs_bh'];
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['bh']=$v['wgjs_bh'];
|
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['员工姓名']=$v['员工姓名'];
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['员工姓名']=$v['员工姓名'];
|
|
@@ -370,8 +370,8 @@ class EmployeeDailySalary extends Api
|
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计件工资']=0;
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计件工资']=0;
|
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['加班工资']=0;
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['加班工资']=0;
|
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时时数']=$v['wgjs_js'];
|
|
$list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时时数']=$v['wgjs_js'];
|
|
|
- $list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时工资']=floatval(number_format($v['wgjs_js']*9.5,2, '.', ''));
|
|
|
|
|
- $list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['日工资合计']=floatval(number_format($v['wgjs_js']*9.5,2, '.', ''));
|
|
|
|
|
|
|
+ $list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时工资']=floatval(number_format($v['wgjs_js']*10,2, '.', ''));
|
|
|
|
|
+ $list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['日工资合计']=floatval(number_format($v['wgjs_js']*10,2, '.', ''));
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
$list1 = [];
|
|
$list1 = [];
|
|
@@ -445,7 +445,7 @@ class EmployeeDailySalary extends Api
|
|
|
$v['计时时数'] += $list[$k]['计时时数'];
|
|
$v['计时时数'] += $list[$k]['计时时数'];
|
|
|
unset($list[$k]);
|
|
unset($list[$k]);
|
|
|
}
|
|
}
|
|
|
- $v['计时工资'] = array_key_exists($k,$brr) ? floatval(number_format($v['计时时数']*9.5+$brr[$k],2, '.', '')) : floatval(number_format($v['计时时数']*9.5,2, '.', ''));
|
|
|
|
|
|
|
+ $v['计时工资'] = array_key_exists($k,$brr) ? floatval(number_format($v['计时时数']*10+$brr[$k],2, '.', '')) : floatval(number_format($v['计时时数']*10,2, '.', ''));
|
|
|
$v['日工资合计'] = floatval(number_format($v['计件工资'] + $v['加班工资'] + $v['计时工资'],2, '.', ''));
|
|
$v['日工资合计'] = floatval(number_format($v['计件工资'] + $v['加班工资'] + $v['计时工资'],2, '.', ''));
|
|
|
|
|
|
|
|
unset($v['rq_bh']);
|
|
unset($v['rq_bh']);
|