|
|
@@ -114,15 +114,22 @@ class OvertimeVerification extends Api
|
|
|
$res=db()->table('绩效工资汇总')
|
|
|
->join('人事_基本资料','人事_基本资料.员工编号=绩效工资汇总.bh','LEFT')
|
|
|
->field('bh,rtrim(xm) as 员工姓名,人事_基本资料.工资表类别,LEFT(人事_基本资料.聘用日期, 10) as 聘用日期,法定天数,
|
|
|
- sum(日定额) as 当月定额,(sum(班组车头产量*工序难度系数)+sum(班组换算产量)) as 月度合计产量,sum(个人计件工资) as 个人计件工资,
|
|
|
+ 日定额,(sum(班组车头产量*工序难度系数)+sum(班组换算产量)) as 月度合计产量,sum(个人计件工资) as 个人计件工资,
|
|
|
sum(个人加班工资) as 个人加班工资,sum(计时补差额工资) as 计时补差,LEFT(sczl_rq, 7) as sczl_rq')
|
|
|
- ->group('绩效工资汇总.bh')
|
|
|
+ ->group('LEFT(sczl_rq, 10),绩效工资汇总.bh')
|
|
|
+ // ->group('绩效工资汇总.bh')
|
|
|
->where('sys_ny',$req['date'])
|
|
|
->where('人事_基本资料.所在部门',$req['department'])
|
|
|
- ->select();
|
|
|
+ ->buildSql(true);
|
|
|
+ // ->select();
|
|
|
if(!$res){
|
|
|
$this->error('失败');
|
|
|
}
|
|
|
+ $res=Db::table("$res gz")->field("bh,员工姓名,工资表类别,聘用日期,法定天数,
|
|
|
+ sum(日定额) as 当月定额,sum(月度合计产量) as 月度合计产量,sum(个人计件工资) as 个人计件工资,
|
|
|
+ sum(个人加班工资) as 个人加班工资,sum(计时补差) as 计时补差,sczl_rq")
|
|
|
+ ->group('bh')
|
|
|
+ ->select();
|
|
|
$year=substr($req['date'],0,4);
|
|
|
$month=substr($req['date'],-2);
|
|
|
if($month==12){
|