计件员工加班费/员工日工资计时时数等数据优化

application/api/controller/EmployeeDailySalary.php

@@ -133,6 +133,7 @@ class EmployeeDailySalary extends Api
             $arr = array_merge($arr, $r);
         }
         
+        $list = [];
         foreach($arr as $v){
             if(isset($list[$v['wgjs_bh'].'-'.$v['wgjs_rq']])){
                 $list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['计时时数']+=$v['wgjs_js'];

application/api/controller/OvertimeVerification.php

@@ -121,12 +121,7 @@ class OvertimeVerification extends Api
             ->column('CONCAT(j.bh, "-", DATE_FORMAT(sczl_rq,"%Y.%m")) AS rq_bh,j.bh,rtrim(j.xm) as 员工姓名,r.工资表类别,DATE_FORMAT(r.聘用日期,"%Y.%m.%d") as 聘用日期,j.法定天数,
             sum(j.日定额) as 当月定额,(sum(j.班组车头产量*j.工序难度系数)+sum(j.班组换算产量)) as 月度合计产量,sum(j.个人计件工资) as 个人计件工资,
             sum(j.个人加班工资) as 个人加班工资,sum(j.异常停机工时) as 月计时时数,LEFT(j.sczl_rq, 7) as sczl_rq');
-        // $res=Db::table("$res gz")->field("bh,员工姓名,工资表类别,聘用日期,法定天数,
-        //     sum(日定额) as 当月定额,sum(月度合计产量) as 月度合计产量,sum(个人计件工资) as 个人计件工资,
-        //     sum(个人加班工资) as 个人加班工资,sum(计时补差) as 计时补差,sczl_rq")
-        //     ->group('bh')
-        //     ->select();
-            // halt($res);
+
         $year=substr($req['date'],0,4);
         $month=substr($req['date'],-2);
         $start_time = $year . '-' . $month . '-01 00:00:00';
@@ -144,6 +139,8 @@ class OvertimeVerification extends Api
 
             $arr = array_merge($arr, $r);
         }
+        
+        $list = [];
         foreach($arr as $v){
             if(isset($list[$v['wgjs_bh'].'-'.$v['wgjs_rq']])){
                 $list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['月计时时数']+=$v['wgjs_js'];
@@ -166,7 +163,7 @@ class OvertimeVerification extends Api
             $v['计时补差'] = floatval(number_format($v['月计时时数']*9.5,2));
             unset($v['rq_bh']);
         }
-       
+        $res = array_values($res);
         $this->success('成功',$res);
     }
     /**