计件员工加班费侧边栏优化

application/api/controller/EmployeeDailySalary.php

@@ -90,6 +90,7 @@ class EmployeeDailySalary extends Api
             $this->error('请求方式错误');
         }
         $req = $this->request->param();
+        //获取工资汇总表数据
         $res=db('绩效工资汇总')
             ->join('人事_基本资料','人事_基本资料.员工编号=绩效工资汇总.bh')
             ->group('绩效工资汇总.bh,LEFT(sczl_rq, 10)')
@@ -103,6 +104,7 @@ class EmployeeDailySalary extends Api
         $start_time = $year . '-' . $month . '-01 00:00:00';
         $end_time = date('Y-m-t', strtotime("$year-$month-01")) . ' 23:59:59';
         
+        //查询wgjs表获取数据,以供后续计算
         $arr = [];
         $columns = ['wgjs_bh1', 'wgjs_bh2', 'wgjs_bh3', 'wgjs_bh4', 'wgjs_bh5', 'wgjs_bh6'];
         for ($i = 1; $i <= 6; $i++) {
@@ -116,6 +118,7 @@ class EmployeeDailySalary extends Api
             $arr = array_merge($arr, $r);
         }
         
+        //计算wgjs总计时时数
         $list = [];
         foreach($arr as $v){
             if(isset($list[$v['wgjs_bh'].'-'.$v['wgjs_rq']])){
@@ -133,6 +136,8 @@ class EmployeeDailySalary extends Api
                 $list[$v['wgjs_bh'].'-'.$v['wgjs_rq']]['日工资合计']=floatval(number_format($v['wgjs_js']*9.5,2, '.', ''));
             }
         };
+
+        //计算当月冲定额时长
         $list1 = [];
         foreach($arr as $v){
             if(isset($list1[$v['wgjs_bh']])){
@@ -196,6 +201,7 @@ class EmployeeDailySalary extends Api
             }
         }
 
+        //工资汇总表和wgjs表中共有数据汇总 
         foreach($res as $k=>&$v){
             if(array_key_exists($k,$list)){
                 $v['计时时数'] += $list[$k]['计时时数'];
@@ -207,6 +213,7 @@ class EmployeeDailySalary extends Api
             unset($v['rq_bh']);
         }
 
+        //工资汇总表和wgjs表中不共有数据合并 
         $rows = array_merge($res,$list);
         ksort($rows);
         $rows = array_values($rows);

application/api/controller/OvertimeVerification.php

@@ -36,6 +36,7 @@ class OvertimeVerification extends Api
             ->field('DATE_FORMAT(`sczl_rq`, "%Y%m") as sys_ny,bh')
             ->group('DATE_FORMAT(`sczl_rq`, "%Y%m"),bh')
             ->whereTime('sczl_rq', '>=', strtotime('-14 months'))
+            ->where('bh','<>','000000')
             ->order('sczl_rq desc')
             ->select();
         foreach($res as $v){