|
|
@@ -169,12 +169,13 @@ class PackagingCountDocument extends Api
|
|
|
$this->error('参数错误');
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ $rs = db()->table('人事_基本资料')->column('员工编号, 员工姓名');
|
|
|
foreach ($rows as $key=>$value){
|
|
|
$rows[$key]['mod_rq'] = $value['mod_rq']=='1900-01-01 00:00:00' ? '' :$value['mod_rq'];
|
|
|
$rows[$key]['sczl_cl'] = floatval($value['sczl_cl']);
|
|
|
$rows[$key]['sczl_fgsl'] = floatval($value['sczl_fgsl']);
|
|
|
$rows[$key]['sczl_jjcl'] = floatval($value['sczl_jjcl']);
|
|
|
+ $rows[$key]['name'] = array_key_exists($value['sczl_bh'],$rs) ? trim($rs[$value['sczl_bh']]) : '';
|
|
|
}
|
|
|
$data = [
|
|
|
'total' => $total,
|