接口查询为空优化

application/api/controller/RelatedSalaryAccounting.php

@@ -79,7 +79,7 @@ class RelatedSalaryAccounting extends Api
             ->join('绩效工资汇总 j', 'r.被关联员工 = j.bh AND r.日期 = j.sczl_rq')
             ->join('人事_基本资料 n', 'n.员工编号 = r.关联员工')
             ->field('r.关联员工, j.bh, sum(j.个人计件工资) as 个人计件工资, sum(j.个人加班工资) as 个人加班工资,
-            sum(j.装版工时,j.保养工时,j.打样工时) as 定额补差, DATE_FORMAT(j.sczl_rq,"%Y.%m.%d") as 日期')
+            sum(j.装版工时,j.保养工时,j.打样工时) as 定额补差, sum(j.异常停机工时) as 计时工资, DATE_FORMAT(j.sczl_rq,"%Y.%m.%d") as 日期')
             ->where('r.日期', 'between', [$start_time, $end_time])
             ->where('n.所在部门', 'like', $req['department'] . '%')
             ->group('LEFT(j.sczl_rq, 10), j.bh')
@@ -91,12 +91,14 @@ class RelatedSalaryAccounting extends Api
                 $data[$v['关联员工']][$v['日期']] = [
                     '个人计件工资' => 0,
                     '个人加班工资' => 0,
-                    '定额补差' => 0
+                    '定额补差' => 0,
+                    '计时工资' => 0
                 ];
             }
             $data[$v['关联员工']][$v['日期']]['个人计件工资'] += (float) $v['个人计件工资'];
             $data[$v['关联员工']][$v['日期']]['个人加班工资'] += (float) $v['个人加班工资'];
             $data[$v['关联员工']][$v['日期']]['定额补差'] += (float) $v['定额补差'];
+            $data[$v['关联员工']][$v['日期']]['计时工资'] += (float) $v['计时工资'];
         }
         
         $res=db('人事_关联工资设置')
@@ -113,12 +115,12 @@ class RelatedSalaryAccounting extends Api
                 $v['关联计件工资'] = floatval(number_format($data[$v['员工编号']][$v['日期']]['个人计件工资']/$v['关联人数']*$v['关联系数'],2));
                 $v['关联加班工资'] = floatval(number_format($data[$v['员工编号']][$v['日期']]['个人加班工资']/$v['关联人数']*$v['关联系数'],2));
                 $v['关联定额补差'] = floatval(number_format($data[$v['员工编号']][$v['日期']]['定额补差']/$v['关联人数']*$v['关联系数'],2));
-                $v['关联计时工资'] = floatval(number_format($data[$v['员工编号']][$v['日期']]['定额补差']/$v['关联人数']*$v['关联系数']*9.5,2));
+                $v['关联计时工资'] = floatval(number_format($data[$v['员工编号']][$v['日期']]['计时工资']/$v['关联人数']*$v['关联系数']*9.5,2));
                 $v['关联工资合计'] = floatval(number_format(
                     ($data[$v['员工编号']][$v['日期']]['个人计件工资'] + 
                     $data[$v['员工编号']][$v['日期']]['个人加班工资'] +
                     $data[$v['员工编号']][$v['日期']]['定额补差'] + 
-                    $data[$v['员工编号']][$v['日期']]['定额补差']*9.5
+                    $data[$v['员工编号']][$v['日期']]['计时工资']*9.5
                     )/$v['关联人数']*$v['关联系数'],2));
             }else{
                 $v['关联计件工资'] = '';
@@ -128,7 +130,7 @@ class RelatedSalaryAccounting extends Api
                 $v['关联工资合计'] = '';
             }
         }
-        if(!$res){
+        if($res===false){
             $this->error('失败');
         }
         $this->success('成功',$res);
@@ -158,7 +160,7 @@ class RelatedSalaryAccounting extends Api
         $gz=db('绩效工资汇总')
             ->cache(true,86400)
             ->field('bh,rtrim(xm) as 姓名,sum(个人计件工资) as 个人计件工资,sum(个人加班工资) as 个人加班工资,
-            (sum(装版工时) + sum(保养工时) + sum(打样工时)) as 定额补差, DATE_FORMAT(sczl_rq,"%Y.%m.%d") as sczl_rq')
+            (sum(装版工时) + sum(保养工时) + sum(打样工时)) as 定额补差, sum(异常停机工时) as 计时工资, DATE_FORMAT(sczl_rq,"%Y.%m.%d") as sczl_rq')
             ->group('LEFT(sczl_rq, 10),bh')
             ->where(['sys_ny'=>$req['date']])
             ->select();
@@ -182,7 +184,7 @@ class RelatedSalaryAccounting extends Api
                 $v['计件工资']=$data[$v['被关联员工']][$v['日期']]['个人计件工资'];
                 $v['加班工资']=$data[$v['被关联员工']][$v['日期']]['个人加班工资'];
                 $v['定额补差']=$data[$v['被关联员工']][$v['日期']]['定额补差'];
-                $v['计时工资']=floatval(number_format($data[$v['被关联员工']][$v['日期']]['定额补差']*9.5,2));
+                $v['计时工资']=floatval(number_format($data[$v['被关联员工']][$v['日期']]['计时工资']*9.5,2));
             }else{
                 $v['被关联姓名']='';
                 $v['计件工资']='';