|
@@ -206,6 +206,7 @@ class EmployeeDailySalary extends Api
|
|
|
$arr1 = db()->table($arr1 . ' t')
|
|
$arr1 = db()->table($arr1 . ' t')
|
|
|
->group('t.bh, LEFT(t.sczl_rq, 7)')
|
|
->group('t.bh, LEFT(t.sczl_rq, 7)')
|
|
|
->column('t.bh,count(t.sczl_rq) as num');
|
|
->column('t.bh,count(t.sczl_rq) as num');
|
|
|
|
|
+
|
|
|
//查询该员工当月停机工时
|
|
//查询该员工当月停机工时
|
|
|
$res1=db('绩效工资汇总')
|
|
$res1=db('绩效工资汇总')
|
|
|
->join('人事_基本资料','人事_基本资料.员工编号=绩效工资汇总.bh')
|
|
->join('人事_基本资料','人事_基本资料.员工编号=绩效工资汇总.bh')
|
|
@@ -225,16 +226,6 @@ class EmployeeDailySalary extends Api
|
|
|
->where(['r.所在部门'=>['like',$req['department'].'%']])
|
|
->where(['r.所在部门'=>['like',$req['department'].'%']])
|
|
|
->group('j.bh,j.sczl_rq,j.sczl_gdbh,j.千件工价')
|
|
->group('j.bh,j.sczl_rq,j.sczl_gdbh,j.千件工价')
|
|
|
->select();
|
|
->select();
|
|
|
- //查询每月有达标定额的天数
|
|
|
|
|
-// $arr3 = db('绩效工资汇总')->alias('j')
|
|
|
|
|
-//// ->field('j.bh,j.sczl_rq')
|
|
|
|
|
-// ->join('人事_基本资料 r','r.员工编号=j.bh')
|
|
|
|
|
-// ->where('j.sys_ny',$req['date'])
|
|
|
|
|
-// ->where('j.达标定额','<>',0)
|
|
|
|
|
-// ->where(['r.所在部门'=>['like',$req['department'].'%']])
|
|
|
|
|
-// ->group('j.bh,j.sczl_rq')
|
|
|
|
|
-// ->column('count(j.sczl_rq) as date','j.bh');
|
|
|
|
|
-// halt($arr3);
|
|
|
|
|
//计算每条记录的计时补差
|
|
//计算每条记录的计时补差
|
|
|
$brr = [];
|
|
$brr = [];
|
|
|
foreach($arr2 as $v){
|
|
foreach($arr2 as $v){
|
