工资查询右侧列表计时工资显示优化

application/api/controller/EmployeeDailySalary.php

@@ -484,7 +484,7 @@ class EmployeeDailySalary extends Api
             ->join('人事_基本资料 r','r.员工编号=j.bh')
             ->group('j.bh,j.sczl_rq')
             ->where('j.sys_ny',$req['date'])
-            // ->where('j.达标定额','<>',0)
+             ->where('j.达标定额','<>',0)
             ->where('j.bh',$req['search'])
             // ->where(['r.所在部门'=>['like',$req['department'].'%']])
             ->buildSql();
@@ -514,13 +514,13 @@ class EmployeeDailySalary extends Api
             ->group('j.bh,j.sczl_rq,j.sczl_gdbh')
             ->select();
        //查询每月有达标定额的天数
-        $arr3 = db('绩效工资汇总')->alias('j')
-            ->join('人事_基本资料 r','r.员工编号=j.bh')
-            ->where('j.sys_ny',$req['date'])
-             ->where('j.达标定额','<>',0)
-            ->where('j.bh',$req['search'])
-            ->group('j.bh,j.sczl_rq')
-            ->count();
+//        $arr3 = db('绩效工资汇总')->alias('j')
+//            ->join('人事_基本资料 r','r.员工编号=j.bh')
+//            ->where('j.sys_ny',$req['date'])
+//             ->where('j.达标定额','<>',0)
+//            ->where('j.bh',$req['search'])
+//            ->group('j.bh,j.sczl_rq')
+//            ->count();
         //计算每条记录的计时补差
         $brr = [];
         foreach($arr2 as $v){
@@ -528,7 +528,7 @@ class EmployeeDailySalary extends Api
             $yjsss2 = array_key_exists($v['bh'],$res1) ? $res1[$v['bh']]['计时时数'] : 0;
             $yjsss = $yjsss1 + $yjsss2;
 
-            $a = $yjsss/$arr3/11*0.6*$v['达标定额']*$v['Rate']*0.5/1000*$v['千件工价'];
+            $a = $yjsss/$arr1[$v['bh']]/11*0.6*$v['达标定额']*$v['Rate']*0.5/1000*$v['千件工价'];
                 
             if(array_key_exists($v['bh'].'-'.$v['sczl_rq'],$brr)){
                 $brr[$v['bh'].'-'.$v['sczl_rq']] += $a;