修改包装计时工资计算日期

application/api/controller/EmployeeDailySalary.php

@@ -153,7 +153,7 @@ class EmployeeDailySalary extends Api
             if(isset($list[$v['sczl_bh'].'-'.$v['sczl_rq']])){
                 $list[$v['sczl_bh'].'-'.$v['sczl_rq']]['计时时数']+=$v['计时时数'];
                 $list[$v['sczl_bh'].'-'.$v['sczl_rq']]['计时工资']=floatval(number_format($list[$v['sczl_bh'].'-'.$v['sczl_rq']]['计时时数']*9.5,2, '.', ''));
-                $list[$v['sczl_bh'].'-'.$v['sczl_rq']]['日工资合计']=floatval(number_format($list[$v['sczl_bh'].'-'.$v['wgjs_rq']]['计时时数']*9.5,2, '.', ''));
+                $list[$v['sczl_bh'].'-'.$v['sczl_rq']]['日工资合计']=floatval(number_format($list[$v['sczl_bh'].'-'.$v['sczl_rq']]['计时时数']*9.5,2, '.', ''));
             }else{
                 $list[$v['sczl_bh'].'-'.$v['sczl_rq']]['bh']=$v['sczl_rq'];
                 $list[$v['sczl_bh'].'-'.$v['sczl_rq']]['员工姓名']=$v['员工姓名'];
@@ -427,7 +427,7 @@ class EmployeeDailySalary extends Api
             if(isset($list[$v['sczl_bh'].'-'.$v['sczl_rq']])){
                 $list[$v['sczl_bh'].'-'.$v['sczl_rq']]['计时时数']+=$v['计时时数'];
                 $list[$v['sczl_bh'].'-'.$v['sczl_rq']]['计时工资']=floatval(number_format($list[$v['sczl_bh'].'-'.$v['sczl_rq']]['计时时数']*9.5,2, '.', ''));
-                $list[$v['sczl_bh'].'-'.$v['sczl_rq']]['日工资合计']=floatval(number_format($list[$v['sczl_bh'].'-'.$v['wgjs_rq']]['计时时数']*9.5,2, '.', ''));
+                $list[$v['sczl_bh'].'-'.$v['sczl_rq']]['日工资合计']=floatval(number_format($list[$v['sczl_bh'].'-'.$v['sczl_rq']]['计时时数']*9.5,2, '.', ''));
             }else{
                 $list[$v['sczl_bh'].'-'.$v['sczl_rq']]['bh']=$v['sczl_rq'];
                 $list[$v['sczl_bh'].'-'.$v['sczl_rq']]['员工姓名']=$v['员工姓名'];