|
|
@@ -100,7 +100,7 @@ class RelatedSalaryAccounting extends Api
|
|
|
->field("DATE_FORMAT(wgjs_rq,'%Y.%m.%d') as wgjs_rq, $column as wgjs_bh, 人事_关联工资设置.关联员工, wgjs_js$i as wgjs_js, wgjs_冲定额$i as wgjs_冲定额")
|
|
|
->join('人事_关联工资设置', "人事_关联工资设置.被关联员工=db_wgjs.$column and 人事_关联工资设置.日期 = db_wgjs.wgjs_rq")
|
|
|
->join('人事_基本资料', "人事_基本资料.员工编号=人事_关联工资设置.关联员工")
|
|
|
- ->where(['人事_关联工资设置.日期' => ['between', "$start_time,$end_time"], '人事_基本资料.所在部门' => ['like', $req['department'] . '%']])
|
|
|
+ ->where(['人事_关联工资设置.日期' => ['between', "$start_time,$end_time"], '人事_基本资料.所在部门' => $req['department']])
|
|
|
->select();
|
|
|
// $r = db('db_wgjs')
|
|
|
// ->field("DATE_FORMAT(wgjs_rq,'%Y.%m.%d') as wgjs_rq, $column as wgjs_bh, 人事_关联工资设置.关联员工, wgjs_js$i as wgjs_js, wgjs_冲定额$i as wgjs_冲定额")
|
